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 2018/09/14 07:48:32 UTC
[incubator-servicecomb-saga] 03/03: SCB-877 Clean up the code of
unit test of alpha-server
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-887
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 3cbb64d7d8c0a89991ac1b496307800fa4636281
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Sep 14 15:47:22 2018 +0800
SCB-877 Clean up the code of unit test of alpha-server
---
...ServerTest.java => AlphaTccServerTestBase.java} | 11 +++++-
.../alpha/tcc/server/MemoryAlphaTccServerTest.java | 43 +---------------------
.../alpha/tcc/server/RdbAlphaTccServerTest.java | 41 +--------------------
3 files changed, 12 insertions(+), 83 deletions(-)
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTestBase.java
similarity index 99%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTestBase.java
index 43c3259..c9233e1 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTestBase.java
@@ -50,10 +50,9 @@ import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEve
import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
-public abstract class AlphaTccServerTest {
+public abstract class AlphaTccServerTestBase {
protected static ManagedChannel clientChannel;
@@ -93,6 +92,7 @@ public abstract class AlphaTccServerTest {
blockingStub.onDisconnected(serviceConfig);
}
+ @Test
public void assertOnConnect() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -101,6 +101,7 @@ public abstract class AlphaTccServerTest {
);
}
+ @Test
public void assertOnDisConnect() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -115,6 +116,7 @@ public abstract class AlphaTccServerTest {
await().atMost(2, SECONDS).until(() -> null != (OmegaCallbacksRegistry.getRegistry().get(serviceName)));
}
+ @Test
public void assertOnTransactionStart() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -142,6 +144,7 @@ public abstract class AlphaTccServerTest {
assertThat(event.getStatus(), is(TransactionStatus.Succeed.name()));
}
+ @Test
public void assertOnParticipated() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -178,6 +181,7 @@ public abstract class AlphaTccServerTest {
assertThat(result.getAborted(), is(false));
}
+ @Test
public void assertOnTccTransactionFailedEnded() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -194,6 +198,7 @@ public abstract class AlphaTccServerTest {
assertThat(commandStreamObserver.isCompleted(), is(false));
}
+ @Test
public void assertOnCallbackNotExist() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -205,6 +210,7 @@ public abstract class AlphaTccServerTest {
assertThat(result.getAborted(), is(true));
}
+ @Test
public void assertOnCallbacksExecuteError() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
awaitUntilConnected();
@@ -218,6 +224,7 @@ public abstract class AlphaTccServerTest {
assertThat(OmegaCallbacksRegistry.getRegistry().get(serviceName).size(), is(0));
}
+ @Test
public void assertOnSwitchOtherCallbackInstance() {
asyncStub.onConnected(serviceConfig, commandStreamObserver);
GrpcServiceConfig config = GrpcServiceConfig.newBuilder()
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/MemoryAlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/MemoryAlphaTccServerTest.java
index 59d3c19..6dd9fcf 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/MemoryAlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/MemoryAlphaTccServerTest.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringRunner;
"alpha.server.port=8090",
"alpha.server.storage=local"
})
-public class MemoryAlphaTccServerTest extends AlphaTccServerTest {
+public class MemoryAlphaTccServerTest extends AlphaTccServerTestBase {
@BeforeClass
public static void setupClientChannel() {
@@ -50,44 +50,5 @@ public class MemoryAlphaTccServerTest extends AlphaTccServerTest {
public TccTxEventFacade getTccTxEventFacade() {
return tccTxEventFacade;
}
-
- @Test
- public void assertOnDisConnect() {
- super.assertOnDisConnect();
- }
-
- @Test
- public void assertOnTransactionStart() {
- super.assertOnTransactionStart();
- }
-
- @Test
- public void assertOnParticipated() {
- super.assertOnParticipated();
- }
-
- @Test
- public void assertOnTccTransactionSucceedEnded() {
- super.assertOnTccTransactionSucceedEnded();
- }
-
- @Test
- public void assertOnTccTransactionFailedEnded() {
- super.assertOnTccTransactionFailedEnded();
- }
-
- @Test
- public void assertOnCallbackNotExist() {
- super.assertOnCallbackNotExist();
- }
-
- @Test
- public void assertOnCallbacksExecuteError() {
- super.assertOnCallbacksExecuteError();
- }
-
- @Test
- public void assertOnSwitchOtherCallbackInstance() {
- super.assertOnSwitchOtherCallbackInstance();
- }
+
}
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/RdbAlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/RdbAlphaTccServerTest.java
index e2db6eb..a81a415 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/RdbAlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/RdbAlphaTccServerTest.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringRunner;
"alpha.server.port=8091",
"alpha.server.storage=rdb"
})
-public class RdbAlphaTccServerTest extends AlphaTccServerTest {
+public class RdbAlphaTccServerTest extends AlphaTccServerTestBase {
@BeforeClass
public static void setupClientChannel() {
@@ -51,43 +51,4 @@ public class RdbAlphaTccServerTest extends AlphaTccServerTest {
return tccTxEventFacade;
}
- @Test
- public void assertOnDisConnect() {
- super.assertOnDisConnect();
- }
-
- @Test
- public void assertOnTransactionStart() {
- super.assertOnTransactionStart();
- }
-
- @Test
- public void assertOnParticipated() {
- super.assertOnParticipated();
- }
-
- @Test
- public void assertOnTccTransactionSucceedEnded() {
- super.assertOnTccTransactionSucceedEnded();
- }
-
- @Test
- public void assertOnTccTransactionFailedEnded() {
- super.assertOnTccTransactionFailedEnded();
- }
-
- @Test
- public void assertOnCallbackNotExist() {
- super.assertOnCallbackNotExist();
- }
-
- @Test
- public void assertOnCallbacksExecuteError() {
- super.assertOnCallbacksExecuteError();
- }
-
- @Test
- public void assertOnSwitchOtherCallbackInstance() {
- super.assertOnSwitchOtherCallbackInstance();
- }
}