Fix tests failing randomly

Tests modified in this change set fail randomly due to shared
mutable state between multiple threads.

This commit ensures that the shared state is correctly
synchronised between threads or re-initialized before each test run.

Author: fmbenhassine

spring-batch-core/src/test/java/org/springframework/batch/core/jsr/partition/JsrPartitionHandlerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2018 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,6 +45,7 @@
 import java.util.Properties;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -55,7 +56,7 @@ public class JsrPartitionHandlerTests extends AbstractJsrTestCase {
 	private JsrPartitionHandler handler;
 	private JobRepository repository = new JobRepositorySupport();
 	private StepExecution stepExecution;
-	private int count;
+	private AtomicInteger count;
 	private BatchPropertyContext propertyContext;
 	private JsrStepExecutionSplitter stepSplitter;
 
@@ -67,12 +68,12 @@ public void setUp() throws Exception {
 		stepSplitter = new JsrStepExecutionSplitter(repository, false, "step1", true);
 		Analyzer.collectorData = "";
 		Analyzer.status = "";
-		count = 0;
+		count = new AtomicInteger(0);
 		handler = new JsrPartitionHandler();
 		handler.setStep(new StepSupport() {
 			@Override
 			public void execute(StepExecution stepExecution) throws JobInterruptedException {
-				count++;
+				count.incrementAndGet();
 				stepExecution.setStatus(org.springframework.batch.core.BatchStatus.COMPLETED);
 				stepExecution.setExitStatus(new ExitStatus("done"));
 			}
@@ -135,7 +136,7 @@ public void testHardcodedNumberOfPartitions() throws Exception {
 		Collection<StepExecution> executions = handler.handle(stepSplitter, stepExecution);
 
 		assertEquals(3, executions.size());
-		assertEquals(3, count);
+		assertEquals(3, count.get());
 	}
 
 	@Test
@@ -151,7 +152,7 @@ public void testPollingPartitionsCompletion() throws Exception {
 		stopWatch.stop();
 
 		assertEquals(3, executions.size());
-		assertEquals(3, count);
+		assertEquals(3, count.get());
 		assertTrue(stopWatch.getLastTaskTimeMillis() >= 1000);
 	}
 
@@ -173,7 +174,7 @@ public PartitionPlan mapPartitions() throws Exception {
 		Collection<StepExecution> executions = handler.handle(new JsrStepExecutionSplitter(repository, false, "step1", true), stepExecution);
 
 		assertEquals(3, executions.size());
-		assertEquals(3, count);
+		assertEquals(3, count.get());
 	}
 
 	@Test
@@ -194,7 +195,7 @@ public PartitionPlan mapPartitions() throws Exception {
 		Collection<StepExecution> executions = handler.handle(new JsrStepExecutionSplitter(repository, false, "step1", true), stepExecution);
 
 		assertEquals(3, executions.size());
-		assertEquals(3, count);
+		assertEquals(3, count.get());
 	}
 
 	@Test
@@ -221,7 +222,7 @@ public PartitionPlan mapPartitions() throws Exception {
 		Collection<StepExecution> executions = handler.handle(new JsrStepExecutionSplitter(repository, false, "step1", true), stepExecution);
 
 		assertEquals(3, executions.size());
-		assertEquals(3, count);
+		assertEquals(3, count.get());
 		assertEquals("value1", propertyContext.getStepProperties("step1:partition0").get("key1"));
 		assertEquals("value2", propertyContext.getStepProperties("step1:partition1").get("key1"));
 	}
@@ -241,7 +242,7 @@ public void testAnalyzer() throws Exception {
 		Collection<StepExecution> executions = handler.handle(new JsrStepExecutionSplitter(repository, false, "step1", true), stepExecution);
 
 		assertEquals(2, executions.size());
-		assertEquals(2, count);
+		assertEquals(2, count.get());
 		assertEquals("foobar", Analyzer.collectorData);
 		assertEquals("COMPLETEDdone", Analyzer.status);
 	}