Polish Spring Batch Infrastructure tests

Author: hpoettker

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/AbstractExceptionTests.java renamed to spring-batch-infrastructure/src/test/java/org/springframework/batch/common/AbstractExceptionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat;
+package org.springframework.batch.common;
 
 import org.junit.jupiter.api.Test;
 
@@ -23,19 +23,19 @@
 public abstract class AbstractExceptionTests {
 
 	@Test
-	public void testExceptionString() throws Exception {
+	void testExceptionString() {
 		Exception exception = getException("foo");
 		assertEquals("foo", exception.getMessage());
 	}
 
 	@Test
-	public void testExceptionStringThrowable() throws Exception {
+	void testExceptionStringThrowable() {
 		Exception exception = getException("foo", new IllegalStateException());
 		assertEquals("foo", exception.getMessage().substring(0, 3));
 	}
 
-	public abstract Exception getException(String msg) throws Exception;
+	protected abstract Exception getException(String msg);
 
-	public abstract Exception getException(String msg, Throwable t) throws Exception;
+	protected abstract Exception getException(String msg, Throwable t);
 
 }

spring-batch-infrastructure/src/test/java/org/springframework/batch/config/DatasourceTests.java

@@ -26,14 +26,14 @@
 import org.junit.jupiter.api.Test;
 
 @SpringJUnitConfig(locations = "/org/springframework/batch/jms/jms-context.xml")
-public class DatasourceTests {
+class DatasourceTests {
 
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
 	@Transactional
 	@Test
-	public void testTemplate() throws Exception {
+	void testTemplate() {
 		System.err.println(System.getProperty("java.class.path"));
 		JdbcTestUtils.deleteFromTables(jdbcTemplate, "T_BARS");
 		int count = JdbcTestUtils.countRowsInTable(jdbcTemplate, "T_BARS");

spring-batch-infrastructure/src/test/java/org/springframework/batch/config/MessagingTests.java

@@ -29,21 +29,21 @@
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 @SpringJUnitConfig(locations = "/org/springframework/batch/jms/jms-context.xml")
-public class MessagingTests {
+class MessagingTests {
 
 	@Autowired
 	private JmsTemplate jmsTemplate;
 
 	@BeforeEach
-	public void onSetUp() throws Exception {
+	void onSetUp() throws Exception {
 		Thread.sleep(100L);
 		getMessages(); // drain queue
 		jmsTemplate.convertAndSend("queue", "foo");
 		jmsTemplate.convertAndSend("queue", "bar");
 	}
 
 	@Test
-	public void testMessaging() throws Exception {
+	void testMessaging() {
 		List<String> list = getMessages();
 		System.err.println(list);
 		assertEquals(2, list.size());

spring-batch-infrastructure/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerIntegrationTests.java

@@ -48,25 +48,25 @@
 /**
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
- * 
+ *
  */
 @SpringJUnitConfig(locations = "/org/springframework/batch/jms/jms-context.xml")
 @DirtiesContext
-public class BatchMessageListenerContainerIntegrationTests {
+class BatchMessageListenerContainerIntegrationTests {
 
 	@Autowired
 	private JmsTemplate jmsTemplate;
 
 	@Autowired
 	private BatchMessageListenerContainer container;
 
-	private volatile BlockingQueue<String> recovered = new LinkedBlockingQueue<>();
+	private final BlockingQueue<String> recovered = new LinkedBlockingQueue<>();
 
-	private volatile BlockingQueue<String> processed = new LinkedBlockingQueue<>();
+	private final BlockingQueue<String> processed = new LinkedBlockingQueue<>();
 
 	@AfterEach
 	@BeforeEach
-	public void drainQueue() throws Exception {
+	void drainQueue() {
 		container.stop();
 		while (jmsTemplate.receiveAndConvert("queue") != null) {
 			// do nothing
@@ -75,17 +75,17 @@ public void drainQueue() throws Exception {
 	}
 
 	@AfterAll
-	public static void giveContainerTimeToStop() throws Exception {
+	static void giveContainerTimeToStop() throws Exception {
 		Thread.sleep(1000);
 	}
 
 	@Test
-	public void testConfiguration() throws Exception {
+	void testConfiguration() {
 		assertNotNull(container);
 	}
 
 	@Test
-	public void testSendAndReceive() throws Exception {
+	void testSendAndReceive() throws Exception {
 		container.setMessageListener(new MessageListener() {
 			@Override
 			public void onMessage(Message msg) {
@@ -109,7 +109,7 @@ public void onMessage(Message msg) {
 	}
 
 	@Test
-	public void testFailureAndRepresent() throws Exception {
+	void testFailureAndRepresent() throws Exception {
 		container.setMessageListener(new MessageListener() {
 			@Override
 			public void onMessage(Message msg) {
@@ -131,7 +131,7 @@ public void onMessage(Message msg) {
 	}
 
 	@Test
-	public void testFailureAndRecovery() throws Exception {
+	void testFailureAndRecovery() throws Exception {
 		final RetryTemplate retryTemplate = new RetryTemplate();
 		retryTemplate.setRetryPolicy(new NeverRetryPolicy());
 		container.setMessageListener(new MessageListener() {

spring-batch-infrastructure/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java

@@ -35,17 +35,17 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class BatchMessageListenerContainerTests {
+class BatchMessageListenerContainerTests {
 
 	BatchMessageListenerContainer container;
 
 	@Test
-	public void testReceiveAndExecuteWithCallback() throws Exception {
+	void testReceiveAndExecuteWithCallback() throws Exception {
 		RepeatTemplate template = new RepeatTemplate();
 		template.setCompletionPolicy(new SimpleCompletionPolicy(2));
 		container = getContainer(template);
@@ -71,7 +71,7 @@ public void onMessage(Message arg0) {
 	}
 
 	@Test
-	public void testReceiveAndExecuteWithCallbackReturningNull() throws Exception {
+	void testReceiveAndExecuteWithCallbackReturningNull() throws Exception {
 		RepeatTemplate template = new RepeatTemplate();
 		template.setCompletionPolicy(new SimpleCompletionPolicy(2));
 		container = getContainer(template);
@@ -91,23 +91,18 @@ public void testReceiveAndExecuteWithCallbackReturningNull() throws Exception {
 	}
 
 	@Test
-	public void testTransactionalReceiveAndExecuteWithCallbackThrowingException() throws Exception {
+	void testTransactionalReceiveAndExecuteWithCallbackThrowingException() {
 		RepeatTemplate template = new RepeatTemplate();
 		template.setCompletionPolicy(new SimpleCompletionPolicy(2));
 		container = getContainer(template);
 		container.setSessionTransacted(true);
-		try {
-			boolean received = doTestWithException(new IllegalStateException("No way!"), true, 2);
-			assertFalse(received, "Message received");
-			fail("Expected IllegalStateException");
-		}
-		catch (IllegalStateException e) {
-			assertEquals("No way!", e.getMessage());
-		}
+		Exception exception = assertThrows(IllegalStateException.class,
+				() -> doTestWithException(new IllegalStateException("No way!"), true, 2));
+		assertEquals("No way!", exception.getMessage());
 	}
 
 	@Test
-	public void testNonTransactionalReceiveAndExecuteWithCallbackThrowingException() throws Exception {
+	void testNonTransactionalReceiveAndExecuteWithCallbackThrowingException() throws Exception {
 		RepeatTemplate template = new RepeatTemplate();
 		template.setCompletionPolicy(new SimpleCompletionPolicy(2));
 		container = getContainer(template);
@@ -117,19 +112,13 @@ public void testNonTransactionalReceiveAndExecuteWithCallbackThrowingException()
 	}
 
 	@Test
-	public void testNonTransactionalReceiveAndExecuteWithCallbackThrowingError() throws Exception {
+	void testNonTransactionalReceiveAndExecuteWithCallbackThrowingError() throws Exception {
 		RepeatTemplate template = new RepeatTemplate();
 		template.setCompletionPolicy(new SimpleCompletionPolicy(2));
 		container = getContainer(template);
 		container.setSessionTransacted(false);
-		try {
-			boolean received = doTestWithException(new RuntimeException("No way!"), false, 2);
-			assertTrue(received, "Message not received but listener not transactional so this should be true");
-		}
-		catch (RuntimeException e) {
-			assertEquals("No way!", e.getMessage());
-			fail("Unexpected Error - should be swallowed");
-		}
+		boolean received = doTestWithException(new RuntimeException("No way!"), false, 2);
+		assertTrue(received, "Message not received but listener not transactional so this should be true");
 	}
 
 	private BatchMessageListenerContainer getContainer(RepeatTemplate template) {

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemReaderTests.java

@@ -36,15 +36,15 @@ public abstract class AbstractItemReaderTests {
 	protected abstract ItemReader<Foo> getItemReader() throws Exception;
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	protected void setUp() throws Exception {
 		tested = getItemReader();
 	}
 
 	/**
 	 * Regular scenario - read the input and eventually return null.
 	 */
 	@Test
-	public void testRead() throws Exception {
+	void testRead() throws Exception {
 
 		Foo foo1 = tested.read();
 		assertEquals(1, foo1.getValue());
@@ -68,7 +68,7 @@ public void testRead() throws Exception {
 	 * Empty input should be handled gracefully - null is returned on first read.
 	 */
 	@Test
-	public void testEmptyInput() throws Exception {
+	void testEmptyInput() throws Exception {
 		pointToEmptyInput(tested);
 		tested.read();
 		assertNull(tested.read());

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemStreamItemReaderTests.java

@@ -39,13 +39,13 @@ protected ItemStream testedAsStream() {
 
 	@Override
 	@BeforeEach
-	public void setUp() throws Exception {
+	protected void setUp() throws Exception {
 		super.setUp();
 		testedAsStream().open(executionContext);
 	}
 
 	@AfterEach
-	public void tearDown() throws Exception {
+	protected void tearDown() throws Exception {
 		testedAsStream().close();
 	}
 
@@ -55,7 +55,7 @@ public void tearDown() throws Exception {
 	 * finished.
 	 */
 	@Test
-	public void testRestart() throws Exception {
+	protected void testRestart() throws Exception {
 
 		testedAsStream().update(executionContext);
 
@@ -84,7 +84,7 @@ public void testRestart() throws Exception {
 	 * should continue where the old one finished.
 	 */
 	@Test
-	public void testResetAndRestart() throws Exception {
+	void testResetAndRestart() throws Exception {
 
 		testedAsStream().update(executionContext);
 
@@ -111,7 +111,7 @@ public void testResetAndRestart() throws Exception {
 	}
 
 	@Test
-	public void testReopen() throws Exception {
+	void testReopen() throws Exception {
 		testedAsStream().update(executionContext);
 
 		Foo foo1 = tested.read();