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
The following commit(s) were added to refs/heads/master by this push: new e51c9fa SCB-584 Clear up testing code for Dubbo filter tests e51c9fa is described below commit e51c9fa896d70ad85dd5931c521a72a12f5ee529 Author: Yang Bo <yangb...@huawei.com> AuthorDate: Wed May 16 11:21:19 2018 +0800 SCB-584 Clear up testing code for Dubbo filter tests The IdGenerator is not used thus removed. Also add omegaContext.clear() in setup to make the tests pass in linux. But the problem still exists, the filters should use a better way to get the omegaContext, see SCB-584 for details. --- .../src/test/java/SagaDubboConsumerFilterTest.java | 5 +---- .../src/test/java/SagaDubboProviderFilterTest.java | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java index d2e7a99..779b732 100644 --- a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java +++ b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboConsumerFilterTest.java @@ -17,7 +17,6 @@ import com.alibaba.dubbo.config.spring.extension.SpringExtensionFactory; import com.alibaba.dubbo.rpc.Invocation; -import org.apache.servicecomb.saga.omega.context.IdGenerator; import org.apache.servicecomb.saga.omega.context.OmegaContext; import org.apache.servicecomb.saga.omega.transport.dubbo.SagaDubboConsumerFilter; import org.junit.After; @@ -38,8 +37,6 @@ public class SagaDubboConsumerFilterTest { private static final String globalTxId = UUID.randomUUID().toString(); private static final String localTxId = UUID.randomUUID().toString(); - @SuppressWarnings("unchecked") - private final IdGenerator<String> idGenerator = mock(IdGenerator.class); private final OmegaContext omegaContext = new OmegaContext(() -> "ignored"); private final Invocation invocation = mock(Invocation.class); @@ -48,7 +45,7 @@ public class SagaDubboConsumerFilterTest { @Before public void setUp() { - when(idGenerator.nextId()).thenReturn(globalTxId, localTxId); + omegaContext.clear(); when(applicationContext.containsBean("omegaContext")).thenReturn(true); when(applicationContext.getBean("omegaContext")).thenReturn(omegaContext); SpringExtensionFactory.addApplicationContext(applicationContext); diff --git a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java index 0a5f576..1b95339 100644 --- a/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java +++ b/omega/omega-transport/omega-transport-dubbo/src/test/java/SagaDubboProviderFilterTest.java @@ -45,7 +45,6 @@ public class SagaDubboProviderFilterTest { @Before public void setUp() { omegaContext.clear(); - ApplicationContext applicationContext = mock(ApplicationContext.class); when(applicationContext.containsBean("omegaContext")).thenReturn(true); when(applicationContext.getBean("omegaContext")).thenReturn(omegaContext); SpringExtensionFactory.addApplicationContext(applicationContext); -- To stop receiving notification emails like this one, please contact ningji...@apache.org.