You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2022/09/06 04:26:08 UTC
[servicecomb-pack] branch master updated (5dda9dc1 -> e802aaff)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
from 5dda9dc1 Bump gson from 2.8.4 to 2.8.9 in /pack-dependencies
new 415f960a SCB-2679 Add a refactored module to coverage aggregate
new bbc42c8e SCB-2679 Move test cases to the correct location
new e802aaff SCB-2679 Add table master_lock to schema.sql for test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../saga/db/AlphaIntegrationWithSpecSagaDbTest.java} | 12 +++++++++---
...lphaIntegrationWithSpecSagaDbWithRandomPortTest.java} | 16 ++++++++++------
.../db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java} | 12 +++++++++---
alpha/alpha-server/src/test/resources/schema.sql | 6 ++++++
.../alpha/spec/tcc/db/test/AlphaTccEventController.java | 1 +
integration-tests/coverage-aggregate/pom.xml | 12 ++++++++++++
6 files changed, 47 insertions(+), 12 deletions(-)
rename alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/{server/AlphaIntegrationTest.java => spec/saga/db/AlphaIntegrationWithSpecSagaDbTest.java} (98%)
rename alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/{server/AlphaIntegrationWithRandomPortTest.java => spec/saga/db/AlphaIntegrationWithSpecSagaDbWithRandomPortTest.java} (97%)
rename alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/{server/AlphaIntegrationWithSSLTest.java => spec/saga/db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java} (81%)
[servicecomb-pack] 01/03: SCB-2679 Add a refactored module to coverage aggregate
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 415f960adbe9c8408e0ef9e0be1ef2255f2e2b8e
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Sun Sep 4 18:33:10 2022 +0800
SCB-2679 Add a refactored module to coverage aggregate
---
integration-tests/coverage-aggregate/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/integration-tests/coverage-aggregate/pom.xml b/integration-tests/coverage-aggregate/pom.xml
index 45733f06..f3cd3d20 100644
--- a/integration-tests/coverage-aggregate/pom.xml
+++ b/integration-tests/coverage-aggregate/pom.xml
@@ -69,6 +69,18 @@
<groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spec-saga-akka</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spec-saga-db</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb.pack</groupId>
+ <artifactId>alpha-spec-tcc-db</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.servicecomb.pack</groupId>
<artifactId>alpha-server</artifactId>
[servicecomb-pack] 02/03: SCB-2679 Move test cases to the correct location
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit bbc42c8e405b7b37fabc81b697b5097145f5e1bb
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Sun Sep 4 18:34:03 2022 +0800
SCB-2679 Move test cases to the correct location
---
.../saga/db/AlphaIntegrationWithSpecSagaDbTest.java} | 12 +++++++++---
...lphaIntegrationWithSpecSagaDbWithRandomPortTest.java} | 16 ++++++++++------
.../db/AlphaIntegrationWithSpecSagaDbWithSSLTest.java} | 12 +++++++++---
.../alpha/spec/tcc/db/test/AlphaTccEventController.java | 1 +
4 files changed, 29 insertions(+), 12 deletions(-)
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 98%
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 07994265..1056d3a8 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 java.util.function.Consumer;
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 @@ import org.springframework.test.context.junit4.SpringRunner;
"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 6ec5a727..a47246e7 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.netty.NettyChannelBuilder;
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 @@ import static org.junit.Assert.assertThat;
"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 81%
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 e5e279a4..dc91efd8 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 @@ import io.netty.handler.ssl.SslProvider;
"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 @@ public class AlphaIntegrationWithSSLTest extends AlphaIntegrationTest {
}
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 2cfdaae7..82048722 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 @@ import org.springframework.web.bind.annotation.RequestMapping;
@Controller
@RequestMapping("/tcc")
+@Profile("test")
public class AlphaTccEventController {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
[servicecomb-pack] 03/03: SCB-2679 Add table master_lock to schema.sql for test
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit e802aaff92686ec0c9537689cff97e9499d17ee8
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Sun Sep 4 18:36:18 2022 +0800
SCB-2679 Add table master_lock to schema.sql for test
---
alpha/alpha-server/src/test/resources/schema.sql | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/alpha/alpha-server/src/test/resources/schema.sql b/alpha/alpha-server/src/test/resources/schema.sql
index 292ade75..2b57211c 100644
--- a/alpha/alpha-server/src/test/resources/schema.sql
+++ b/alpha/alpha-server/src/test/resources/schema.sql
@@ -101,3 +101,9 @@ CREATE TABLE IF NOT EXISTS tcc_tx_event (
lastModified TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
);
+CREATE TABLE IF NOT EXISTS master_lock (
+ serviceName varchar(36) NOT NULL PRIMARY KEY,
+ expireTime TIMESTAMP NOT NULL,
+ lockedTime TIMESTAMP NOT NULL,
+ instanceId varchar(255) NOT NULL
+);
\ No newline at end of file