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/10/10 13:32:33 UTC
[incubator-servicecomb-saga] 04/07: SCB-909 Refine TCC unit case.
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/incubator-servicecomb-saga.git
commit 022e4b50307bab886958c074f439cb3b69375841
Author: cherrylzhao <zh...@126.com>
AuthorDate: Fri Sep 28 22:31:31 2018 +0800
SCB-909 Refine TCC unit case.
---
.../saga/alpha/server/tcc/MemoryAlphaTccServerTest.java | 16 +++-------------
.../saga/alpha/server/tcc/RdbAlphaTccServerTest.java | 9 +--------
.../saga/alpha/server/tcc/TccCallbackEngineTest.java | 5 +----
.../{TestConfiguration.java => TccConfiguration.java} | 2 +-
.../alpha/server/tcc/service/TccTxEventServiceTest.java | 3 ++-
.../tcc/service/TccTxEventServiceTransactionTest.java | 9 ++-------
6 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java
index c64dba2..c7da54d 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/MemoryAlphaTccServerTest.java
@@ -25,26 +25,16 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {TccApplication.class},
+@SpringBootTest(classes = {TccApplication.class, TccConfiguration.class},
properties = {
"alpha.server.host=0.0.0.0",
- "alpha.server.port=8090"
+ "alpha.server.port=8190"
})
@ActiveProfiles("memory")
public class MemoryAlphaTccServerTest extends AlphaTccServerTestBase {
@BeforeClass
public static void setupClientChannel() {
- clientChannel = NettyChannelBuilder.forAddress("localhost", 8090).usePlaintext().build();
+ clientChannel = NettyChannelBuilder.forAddress("localhost", 8190).usePlaintext().build();
}
-
- /*@Autowired
- @Qualifier("defaultTccTxEventFacade")
- private TccTxEventFacade tccTxEventFacade;
-
- @Override
- public TccTxEventFacade getTccTxEventFacade() {
- return tccTxEventFacade;
- }*/
-
}
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java
index 3120813..f4cd431 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/RdbAlphaTccServerTest.java
@@ -18,17 +18,13 @@
package org.apache.servicecomb.saga.alpha.server.tcc;
import io.grpc.netty.NettyChannelBuilder;
-import org.apache.servicecomb.saga.alpha.server.AlphaApplication;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {TccApplication.class},
+@SpringBootTest(classes = {TccApplication.class, TccConfiguration.class},
properties = {
"alpha.server.host=0.0.0.0",
"alpha.server.port=8091"
@@ -39,7 +35,4 @@ public class RdbAlphaTccServerTest extends AlphaTccServerTestBase {
public static void setupClientChannel() {
clientChannel = NettyChannelBuilder.forAddress("localhost", 8091).usePlaintext().build();
}
-
-
-
}
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
index d00535b..1d08597 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
@@ -21,15 +21,12 @@ import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import io.grpc.stub.StreamObserver;
import java.util.UUID;
-import org.apache.servicecomb.saga.alpha.server.AlphaApplication;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
@@ -47,7 +44,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {TccApplication.class},
+@SpringBootTest(classes = {TccApplication.class, TccConfiguration.class},
properties = {
"alpha.server.host=0.0.0.0",
"alpha.server.port=8092",
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TestConfiguration.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java
similarity index 98%
rename from alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TestConfiguration.java
rename to alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java
index 2add869..50f2e00 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TestConfiguration.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccConfiguration.java
@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class TestConfiguration {
+public class TccConfiguration {
@Value("${alpha.compensation.retry.delay:3000}")
private int delay;
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
index d5fd7d6..e45f222 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.verify;
import io.grpc.stub.StreamObserver;
import org.apache.servicecomb.saga.alpha.server.tcc.TccApplication;
+import org.apache.servicecomb.saga.alpha.server.tcc.TccConfiguration;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
@@ -41,7 +42,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {TccApplication.class})
+@SpringBootTest(classes = {TccApplication.class, TccConfiguration.class})
public class TccTxEventServiceTest {
@Autowired
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
index 7c8ece5..e1694f8 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/service/TccTxEventServiceTransactionTest.java
@@ -22,14 +22,11 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import io.grpc.stub.StreamObserver;
import java.util.List;
import java.util.Optional;
import org.apache.servicecomb.saga.alpha.server.tcc.TccApplication;
-import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
+import org.apache.servicecomb.saga.alpha.server.tcc.TccConfiguration;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEventRepository;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
@@ -38,8 +35,6 @@ import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEvent;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxEventDBRepository;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
import org.apache.servicecomb.saga.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +45,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {TccApplication.class})
+@SpringBootTest(classes = {TccApplication.class, TccConfiguration.class})
public class TccTxEventServiceTransactionTest {
@Autowired