Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-2291 fixed failing test

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-12-01 09:49:29 -05:00
committed by Mark Fisher
parent eda83aa1ce
commit bc2ca427bc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.integration.channel;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
@@ -35,6 +36,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
@@ -81,8 +83,13 @@ public class MixedDispatcherConfigurationScenarioTests {
private Message<?> message = new GenericMessage<String>("test"); private Message<?> message = new GenericMessage<String>("test");
@SuppressWarnings("unchecked")
@Before @Before
public void initialize() throws Exception { public void initialize() throws Exception {
Mockito.reset(exceptionRegistry);
Mockito.reset(handlerA);
Mockito.reset(handlerB);
Mockito.reset(handlerC);
ac = new ClassPathXmlApplicationContext("MixedDispatcherConfigurationScenarioTests-context.xml", ac = new ClassPathXmlApplicationContext("MixedDispatcherConfigurationScenarioTests-context.xml",
MixedDispatcherConfigurationScenarioTests.class); MixedDispatcherConfigurationScenarioTests.class);
allDone = new CountDownLatch(TOTAL_EXECUTIONS); allDone = new CountDownLatch(TOTAL_EXECUTIONS);