SCB-2679 Move test cases to the correct location
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java
similarity index 97%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java
index 0799426..1056d3a 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.pack.alpha.server;
+package org.apache.servicecomb.pack.alpha.spec.saga.db;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -48,6 +48,8 @@
import javax.annotation.PostConstruct;
import org.apache.servicecomb.pack.alpha.core.*;
+import org.apache.servicecomb.pack.alpha.server.AlphaApplication;
+import org.apache.servicecomb.pack.alpha.server.AlphaConfig;
import org.apache.servicecomb.pack.alpha.spec.saga.db.CommandEntityRepository;
import org.apache.servicecomb.pack.alpha.spec.saga.db.TxEventEnvelopeRepository;
import org.apache.servicecomb.pack.alpha.spec.saga.db.TxTimeoutEntityRepository;
@@ -78,9 +80,13 @@
"alpha.server.host=0.0.0.0",
"alpha.server.port=8090",
"alpha.event.pollingInterval=1",
- "spring.main.allow-bean-definition-overriding=true"
+ "spring.main.allow-bean-definition-overriding=true",
+ "alpha.spec.names=saga-db",
+ "alpha.spec.saga.db.datasource.username=sa",
+ "alpha.spec.saga.db.datasource.url=jdbc:hsqldb:mem:saga",
+ "alpha.spec.saga.db.cluster.enabled=false"
})
-public class AlphaIntegrationTest {
+public class AlphaIntegrationWithSpecSagaDbTest {
private static final int port = 8090;
protected static ManagedChannel clientChannel;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java
similarity index 97%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java
index 6ec5a72..a47246e 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithRandomPortTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.pack.alpha.server;
+package org.apache.servicecomb.pack.alpha.spec.saga.db;
import com.google.protobuf.ByteString;
import io.grpc.ManagedChannel;
@@ -23,9 +23,9 @@
import io.grpc.stub.StreamObserver;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.servicecomb.pack.alpha.core.*;
-import org.apache.servicecomb.pack.alpha.spec.saga.db.CommandEntityRepository;
-import org.apache.servicecomb.pack.alpha.spec.saga.db.TxEventEnvelopeRepository;
-import org.apache.servicecomb.pack.alpha.spec.saga.db.TxTimeoutEntityRepository;
+import org.apache.servicecomb.pack.alpha.server.AlphaApplication;
+import org.apache.servicecomb.pack.alpha.server.AlphaConfig;
+import org.apache.servicecomb.pack.alpha.server.ServerStartable;
import org.apache.servicecomb.pack.common.EventType;
import org.apache.servicecomb.pack.contract.grpc.*;
import org.apache.servicecomb.pack.contract.grpc.TxEventServiceGrpc.TxEventServiceBlockingStub;
@@ -65,9 +65,13 @@
"alpha.server.portAutoIncrement=true",
"alpha.server.portCount=100",
"alpha.event.pollingInterval=1",
- "spring.main.allow-bean-definition-overriding=true"
+ "spring.main.allow-bean-definition-overriding=true",
+ "alpha.spec.names=saga-db",
+ "alpha.spec.saga.db.datasource.username=sa",
+ "alpha.spec.saga.db.datasource.url=jdbc:hsqldb:mem:saga",
+ "alpha.spec.saga.db.cluster.enabled=false",
})
-public class AlphaIntegrationWithRandomPortTest {
+public class AlphaIntegrationWithSpecSagaDbWithRandomPortTest {
protected static ManagedChannel clientChannel;
private static boolean setUpIsDone = false;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java
similarity index 80%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java
index e5e279a..dc91efd 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/AlphaIntegrationWithSSLTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/spec/saga/db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.servicecomb.pack.alpha.server;
+package org.apache.servicecomb.pack.alpha.spec.saga.db;
import java.io.File;
import java.util.Arrays;
import javax.net.ssl.SSLException;
+import org.apache.servicecomb.pack.alpha.server.AlphaApplication;
+import org.apache.servicecomb.pack.alpha.server.AlphaConfig;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
@@ -39,9 +41,13 @@
"alpha.server.port=8092",
"alpha.event.pollingInterval=1",
"spring.main.allow-bean-definition-overriding=true",
+ "alpha.spec.names=saga-db",
+ "alpha.spec.saga.db.datasource.username=sa",
+ "alpha.spec.saga.db.datasource.url=jdbc:hsqldb:mem:saga",
+ "alpha.spec.saga.db.cluster.enabled=false",
"spring.profiles.active=ssl"
})
-public class AlphaIntegrationWithSSLTest extends AlphaIntegrationTest {
+public class AlphaIntegrationWithSpecSagaDbWithSSLTest extends AlphaIntegrationWithSpecSagaDbTest {
private static final int port = 8092;
@BeforeClass
@@ -53,7 +59,7 @@
}
private static SslContext getSslContext(){
- ClassLoader classLoader = AlphaIntegrationWithSSLTest.class.getClassLoader();
+ ClassLoader classLoader = AlphaIntegrationWithSpecSagaDbWithSSLTest.class.getClassLoader();
SslContext sslContext = null;
try {
sslContext = GrpcSslContexts.forClient().sslProvider(SslProvider.OPENSSL)
diff --git a/alpha/alpha-spec-tcc-db/src/main/java/org/apache/servicecomb/pack/alpha/spec/tcc/db/test/AlphaTccEventController.java b/alpha/alpha-spec-tcc-db/src/main/java/org/apache/servicecomb/pack/alpha/spec/tcc/db/test/AlphaTccEventController.java
index 2cfdaae..8204872 100644
--- a/alpha/alpha-spec-tcc-db/src/main/java/org/apache/servicecomb/pack/alpha/spec/tcc/db/test/AlphaTccEventController.java
+++ b/alpha/alpha-spec-tcc-db/src/main/java/org/apache/servicecomb/pack/alpha/spec/tcc/db/test/AlphaTccEventController.java
@@ -36,6 +36,7 @@
@Controller
@RequestMapping("/tcc")
+@Profile("test")
public class AlphaTccEventController {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
