GH-2364 fix intermittent failing test

Resolves #2364

Author: boaty82

spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java

@@ -45,6 +45,7 @@
 /**
  * @author Iwein Fuld
  * @author Mark Fisher
+ * @author Kiel Boatman
  */
 @SuppressWarnings("unchecked")
 public class PollingConsumerEndpointTests {
@@ -63,13 +64,14 @@ public class PollingConsumerEndpointTests {
 
 	private final TestErrorHandler errorHandler = new TestErrorHandler();
 
-	private final PollableChannel channelMock = Mockito.mock(PollableChannel.class);
+	private PollableChannel channelMock;
 
 	private final ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
 
 
 	@Before
 	public void init() throws Exception {
+		channelMock = Mockito.mock(PollableChannel.class);
 		consumer.counter.set(0);
 		trigger.reset();
 		endpoint = new PollingConsumer(channelMock, consumer);
@@ -81,7 +83,6 @@ public void init() throws Exception {
 		endpoint.setReceiveTimeout(-1);
 		endpoint.afterPropertiesSet();
 		taskScheduler.afterPropertiesSet();
-		Mockito.reset(channelMock);
 	}
 
 	@After