Remove some deprecated APIs from tests

spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java

@@ -23,9 +23,7 @@
 import java.util.Properties;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.batch.core.explore.JobExplorer;
 import org.springframework.batch.core.job.SimpleJob;
@@ -34,6 +32,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -59,9 +58,6 @@ public class JobParametersBuilderTests {
 
 	private Date date = new Date(System.currentTimeMillis());
 
-	@Rule
-	public ExpectedException expectedException = ExpectedException.none();
-
 	@Before
 	public void initialize() {
 		this.job = new SimpleJob("simpleJob");
@@ -204,10 +200,10 @@ public void testGetNextJobParametersFirstRun(){
 
 	@Test
 	public void testGetNextJobParametersNoIncrementer(){
-		expectedException.expect(IllegalArgumentException.class);
-		expectedException.expectMessage("No job parameters incrementer found for job=simpleJob");
 		initializeForNextJobParameters();
-		this.parametersBuilder.getNextJobParameters(this.job);
+		final Exception expectedException = assertThrows(IllegalArgumentException.class,
+				() -> this.parametersBuilder.getNextJobParameters(this.job));
+		assertEquals("No job parameters incrementer found for job=simpleJob", expectedException.getMessage());
 	}
 
 	@Test

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java

@@ -17,14 +17,14 @@
 package org.springframework.batch.core.configuration.annotation;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.Callable;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
@@ -57,9 +57,6 @@ public class JobScopeConfigurationTests {
 
 	private JobExecution jobExecution;
 
-	@Rule
-	public ExpectedException expected = ExpectedException.none();
-
 	@Test
 	public void testXmlJobScopeWithProxyTargetClass() throws Exception {
 		context = new ClassPathXmlApplicationContext(
@@ -116,20 +113,22 @@ public void testJobScopeWithProxyTargetClassInjected() throws Exception {
 	public void testIntentionallyBlowUpOnMissingContextWithProxyTargetClass() throws Exception {
 		init(JobScopeConfigurationRequiringProxyTargetClass.class);
 		JobSynchronizationManager.release();
-		expected.expect(BeanCreationException.class);
-		expected.expectMessage("job scope");
-		SimpleHolder value = context.getBean(SimpleHolder.class);
-		assertEquals("JOB", value.call());
+		final Exception expectedException = Assert.assertThrows(BeanCreationException.class, () -> {
+			SimpleHolder value = context.getBean(SimpleHolder.class);
+			assertEquals("JOB", value.call());
+		});
+		assertTrue(expectedException.getMessage().contains("job scope"));
 	}
 
 	@Test
 	public void testIntentionallyBlowupWithForcedInterface() throws Exception {
 		init(JobScopeConfigurationForcingInterfaceProxy.class);
 		JobSynchronizationManager.release();
-		expected.expect(BeanCreationException.class);
-		expected.expectMessage("job scope");
-		SimpleHolder value = context.getBean(SimpleHolder.class);
-		assertEquals("JOB", value.call());
+		final Exception expectedException = Assert.assertThrows(BeanCreationException.class, () -> {
+			SimpleHolder value = context.getBean(SimpleHolder.class);
+			assertEquals("JOB", value.call());
+		});
+		assertTrue(expectedException.getMessage().contains("job scope"));
 	}
 
 	@Test
@@ -144,11 +143,12 @@ public void testJobScopeWithDefaults() throws Exception {
 	public void testIntentionallyBlowUpOnMissingContextWithInterface() throws Exception {
 		init(JobScopeConfigurationWithDefaults.class);
 		JobSynchronizationManager.release();
-		expected.expect(BeanCreationException.class);
-		expected.expectMessage("job scope");
-		@SuppressWarnings("unchecked")
-		Callable<String> value = context.getBean(Callable.class);
-		assertEquals("JOB", value.call());
+		final Exception expectedException = Assert.assertThrows(BeanCreationException.class, () -> {
+			@SuppressWarnings("unchecked")
+			Callable<String> value = context.getBean(Callable.class);
+			assertEquals("JOB", value.call());
+		});
+		assertTrue(expectedException.getMessage().contains("job scope"));
 	}
 
 	public void init(Class<?>... config) throws Exception {

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java

@@ -17,10 +17,9 @@
 package org.springframework.batch.core.configuration.annotation;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.scope.context.ChunkContext;
@@ -42,6 +41,7 @@
 import java.util.concurrent.Callable;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Dave Syer
@@ -55,9 +55,6 @@ public class StepScopeConfigurationTests {
 
 	private StepExecution stepExecution;
 
-	@Rule
-	public ExpectedException expected = ExpectedException.none();
-
 	@Test
 	public void testXmlStepScopeWithProxyTargetClass() throws Exception {
 		context = new ClassPathXmlApplicationContext(
@@ -114,20 +111,23 @@ public void testStepScopeWithProxyTargetClassInjected() throws Exception {
 	public void testIntentionallyBlowUpOnMissingContextWithProxyTargetClass() throws Exception {
 		init(StepScopeConfigurationRequiringProxyTargetClass.class);
 		StepSynchronizationManager.release();
-		expected.expect(BeanCreationException.class);
-		expected.expectMessage("step scope");
-		SimpleHolder value = context.getBean(SimpleHolder.class);
-		assertEquals("STEP", value.call());
+
+		final Exception expectedException = Assert.assertThrows(BeanCreationException.class, () -> {
+			SimpleHolder value = context.getBean(SimpleHolder.class);
+			assertEquals("STEP", value.call());
+		});
+		assertTrue(expectedException.getMessage().contains("step scope"));
 	}
 
 	@Test
 	public void testIntentionallyBlowupWithForcedInterface() throws Exception {
 		init(StepScopeConfigurationForcingInterfaceProxy.class);
 		StepSynchronizationManager.release();
-		expected.expect(BeanCreationException.class);
-		expected.expectMessage("step scope");
-		SimpleHolder value = context.getBean(SimpleHolder.class);
-		assertEquals("STEP", value.call());
+		final Exception expectedException = Assert.assertThrows(BeanCreationException.class, () -> {
+			SimpleHolder value = context.getBean(SimpleHolder.class);
+			assertEquals("STEP", value.call());
+		});
+		assertTrue(expectedException.getMessage().contains("step scope"));
 	}
 
 	@Test
@@ -142,11 +142,13 @@ public void testStepScopeWithDefaults() throws Exception {
 	public void testIntentionallyBlowUpOnMissingContextWithInterface() throws Exception {
 		init(StepScopeConfigurationWithDefaults.class);
 		StepSynchronizationManager.release();
-		expected.expect(BeanCreationException.class);
-		expected.expectMessage("step scope");
-		@SuppressWarnings("unchecked")
-		Callable<String> value = context.getBean(Callable.class);
-		assertEquals("STEP", value.call());
+
+		final Exception expectedException = Assert.assertThrows(BeanCreationException.class, () -> {
+			@SuppressWarnings("unchecked")
+			Callable<String> value = context.getBean(Callable.class);
+			assertEquals("STEP", value.call());
+		});
+		assertTrue(expectedException.getMessage().contains("step scope"));
 	}
 
 	public void init(Class<?>... config) throws Exception {

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

@@ -39,7 +39,7 @@ public class ChunkListenerAdapterTests {
 
 	@Before
 	public void setUp() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		adapter = new ChunkListenerAdapter(delegate);
 	}
 

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

@@ -34,7 +34,7 @@ public class ItemProcessListenerAdapterTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		adapter = new ItemProcessListenerAdapter<>(delegate);
 	}
 

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

@@ -34,7 +34,7 @@ public class ItemReadListenerAdapterTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		adapter = new ItemReadListenerAdapter<>(delegate);
 	}
 

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

@@ -39,7 +39,7 @@ public class ItemWriteListenerAdapterTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		adapter = new ItemWriteListenerAdapter<>(delegate);
 	}
 

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

@@ -34,7 +34,7 @@ public class JobListenerAdapterTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		adapter = new JobListenerAdapter(delegate);
 	}
 

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

@@ -42,7 +42,7 @@ public class JsrJobContextTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 
 		Properties properties = new Properties();
 		properties.put("jobLevelProperty1", "jobLevelValue1");

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

@@ -60,7 +60,7 @@ public static void setUpClass() throws Exception {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		factory = new JsrStepContextFactoryBean();
 		factory.setBatchPropertyContext(propertyContext);
 	}

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

@@ -40,7 +40,7 @@ public class StepListenerAdapterTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 
 		adapter = new StepListenerAdapter(delegate);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParsingTests.java

@@ -16,9 +16,7 @@
 package org.springframework.batch.core.jsr.configuration.xml;
 
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.springframework.batch.core.jsr.AbstractJsrTestCase;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -32,9 +30,6 @@
 
 public class JsrSplitParsingTests extends AbstractJsrTestCase {
 
-	@Rule
-	public ExpectedException expectedException = ExpectedException.none();
-
 	@Test
 	public void testOneFlowInSplit() {
 		try {

spring-batch-core/src/test/java/org/springframework/batch/core/jsr/launch/JsrJobOperatorTests.java

@@ -90,7 +90,7 @@ public class JsrJobOperatorTests extends AbstractJsrTestCase {
 	@Before
 	public void setup() throws Exception {
 
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 		parameterConverter = new JobParametersConverterSupport();
 		jsrJobOperator = new JsrJobOperator(jobExplorer, jobRepository, parameterConverter, new ResourcelessTransactionManager());
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/jsr/step/batchlet/BatchletAdapterTests.java

@@ -42,7 +42,7 @@ public class BatchletAdapterTests {
 
 	@Before
 	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 
 		adapter = new BatchletAdapter(delegate);
 	}

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java

@@ -26,11 +26,10 @@
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 
-import org.junit.rules.ExpectedException;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ChunkListener;
@@ -80,9 +79,6 @@
  */
 public class FaultTolerantStepFactoryBeanTests {
 
-	@Rule
-	public ExpectedException expectedException = ExpectedException.none();
-
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private FaultTolerantStepFactoryBean<String, String> factory;
@@ -142,25 +138,29 @@ public void setUp() throws Exception {
 	}
 
 	@Test
-	public void testMandatoryReader() throws Exception {
+	public void testMandatoryReader() {
+		// given
 		factory = new FaultTolerantStepFactoryBean<>();
 		factory.setItemWriter(writer);
 
-		expectedException.expect(IllegalStateException.class);
-		expectedException.expectMessage("ItemReader must be provided");
+		// when
+		final Exception expectedException = Assert.assertThrows(IllegalStateException.class, factory::getObject);
 
-		factory.getObject();
+		// then
+		assertEquals("ItemReader must be provided", expectedException.getMessage());
 	}
 
 	@Test
 	public void testMandatoryWriter() throws Exception {
+		// given
 		factory = new FaultTolerantStepFactoryBean<>();
 		factory.setItemReader(reader);
 
-		expectedException.expect(IllegalStateException.class);
-		expectedException.expectMessage("ItemWriter must be provided");
+		// when
+		final Exception expectedException = Assert.assertThrows(IllegalStateException.class, factory::getObject);
 
-		factory.getObject();
+		// then
+		assertEquals("ItemWriter must be provided", expectedException.getMessage());
 	}
 
 	/**