Apply AssertJ and JUnit 5 best practices

src/test/java/org/springframework/integration/aws/inbound/KinesisMessageDrivenChannelAdapterTests.java

@@ -82,7 +82,7 @@
  */
 @SpringJUnitConfig
 @DirtiesContext
-public class KinesisMessageDrivenChannelAdapterTests {
+class KinesisMessageDrivenChannelAdapterTests {
 
 	private static final String STREAM1 = "stream1";
 
@@ -118,7 +118,7 @@ void setup() {
 
 	@Test
 	@SuppressWarnings({"unchecked", "rawtypes"})
-	void testKinesisMessageDrivenChannelAdapter() {
+	void kinesisMessageDrivenChannelAdapter() {
 		this.kinesisMessageDrivenChannelAdapter.start();
 		final Set<KinesisShardOffset> shardOffsets = TestUtils.getPropertyValue(this.kinesisMessageDrivenChannelAdapter,
 				"shardOffsets", Set.class);
@@ -168,11 +168,11 @@ void testKinesisMessageDrivenChannelAdapter() {
 		Map<?, ?> forLocking = TestUtils.getPropertyValue(this.kinesisMessageDrivenChannelAdapter,
 				"shardConsumerManager.locks", Map.class);
 
-		await().untilAsserted(() -> assertThat(forLocking).hasSize(0));
+		await().untilAsserted(() -> assertThat(forLocking).isEmpty());
 
 		final List consumerInvokers = TestUtils.getPropertyValue(this.kinesisMessageDrivenChannelAdapter,
 				"consumerInvokers", List.class);
-		await().untilAsserted(() -> assertThat(consumerInvokers).hasSize(0));
+		await().untilAsserted(() -> assertThat(consumerInvokers).isEmpty());
 
 		this.kinesisMessageDrivenChannelAdapter.setListenerMode(ListenerMode.batch);
 		this.kinesisMessageDrivenChannelAdapter.setCheckpointMode(CheckpointMode.record);
@@ -186,8 +186,8 @@ void testKinesisMessageDrivenChannelAdapter() {
 		assertThat(message).isNotNull();
 		assertThat(message.getPayload()).isInstanceOf(List.class);
 		List<String> payload = (List<String>) message.getPayload();
-		assertThat(payload).size().isEqualTo(1);
-		String record = payload.get(0);
+		assertThat(payload).hasSize(1);
+		String record = payload.getFirst();
 		assertThat(record).isEqualTo("bar");
 
 		Object partitionKeyHeader = message.getHeaders().get(AwsHeaders.RECEIVED_PARTITION_KEY);
@@ -219,7 +219,7 @@ void testKinesisMessageDrivenChannelAdapter() {
 		assertThat(message).isNotNull();
 		assertThat(message.getPayload()).isInstanceOf(List.class);
 		List<String> messagePayload = (List<String>) message.getPayload();
-		assertThat(messagePayload).size().isEqualTo(3);
+		assertThat(messagePayload).hasSize(3);
 
 		Object messageSequenceNumberHeader = message.getHeaders().get(AwsHeaders.RECEIVED_SEQUENCE_NUMBER);
 		assertThat(messageSequenceNumberHeader).isInstanceOf(List.class);
@@ -235,17 +235,16 @@ void testKinesisMessageDrivenChannelAdapter() {
 		assertThat(message).isNotNull();
 		assertThat(message.getPayload()).isInstanceOf(List.class);
 		messagePayload = (List<String>) message.getPayload();
-		assertThat(messagePayload).size().isEqualTo(2);
-		assertThat(messagePayload).contains("bar");
-		assertThat(messagePayload).contains("foobar");
+		assertThat(messagePayload).hasSize(2);
+		assertThat(messagePayload).contains("bar", "foobar");
 
 		this.kinesisMessageDrivenChannelAdapter.stop();
 
 	}
 
 	@Test
 	@SuppressWarnings("rawtypes")
-	void testResharding() throws InterruptedException {
+	void resharding() throws InterruptedException {
 		this.reshardingChannelAdapter.start();
 
 		assertThat(this.kinesisChannel.receive(10000)).isNotNull();

src/test/java/org/springframework/integration/aws/inbound/S3InboundChannelAdapterTests.java

@@ -57,7 +57,7 @@
  */
 @SpringJUnitConfig
 @DirtiesContext
-public class S3InboundChannelAdapterTests implements LocalstackContainerTest {
+class S3InboundChannelAdapterTests implements LocalstackContainerTest {
 
 	private static final ExpressionParser PARSER = new SpelExpressionParser();
 
@@ -84,12 +84,12 @@ static void setup() {
 	}
 
 	@Test
-	void testS3InboundChannelAdapter() throws IOException {
+	void s3InboundChannelAdapter() throws IOException {
 		Message<?> message = this.s3FilesChannel.receive(10000);
 		assertThat(message).isNotNull();
 		assertThat(message.getPayload()).isInstanceOf(File.class);
 		File localFile = (File) message.getPayload();
-		assertThat(localFile.getName()).isEqualTo("A.TEST.a");
+		assertThat(localFile).hasName("A.TEST.a");
 
 		String content = FileCopyUtils.copyToString(new FileReader(localFile));
 		assertThat(content).isEqualTo("Hello");
@@ -98,7 +98,7 @@ void testS3InboundChannelAdapter() throws IOException {
 		assertThat(message).isNotNull();
 		assertThat(message.getPayload()).isInstanceOf(File.class);
 		localFile = (File) message.getPayload();
-		assertThat(localFile.getName()).isEqualTo("B.TEST.a");
+		assertThat(localFile).hasName("B.TEST.a");
 
 		content = FileCopyUtils.copyToString(new FileReader(localFile));
 		assertThat(content).isEqualTo("Bye");

src/test/java/org/springframework/integration/aws/inbound/S3StreamingChannelAdapterTests.java

@@ -56,7 +56,7 @@
  */
 @SpringJUnitConfig
 @DirtiesContext
-public class S3StreamingChannelAdapterTests implements LocalstackContainerTest {
+class S3StreamingChannelAdapterTests implements LocalstackContainerTest {
 
 	private static final String S3_BUCKET = "s3-bucket";
 
@@ -74,7 +74,7 @@ static void setup() {
 	}
 
 	@Test
-	void testS3InboundStreamingChannelAdapter() throws IOException {
+	void s3InboundStreamingChannelAdapter() throws IOException {
 		Message<?> message = this.s3FilesChannel.receive(10000);
 		assertThat(message).isNotNull();
 		assertThat(message.getPayload()).isInstanceOf(InputStream.class);

src/test/java/org/springframework/integration/aws/inbound/SnsInboundChannelAdapterTests.java

@@ -55,7 +55,7 @@
  */
 @SpringJUnitWebConfig
 @DirtiesContext
-public class SnsInboundChannelAdapterTests {
+class SnsInboundChannelAdapterTests {
 
 	@Autowired
 	private WebApplicationContext context;
@@ -83,7 +83,7 @@ void setUp() {
 	}
 
 	@Test
-	void testSubscriptionConfirmation() throws Exception {
+	void subscriptionConfirmation() throws Exception {
 		this.mockMvc
 				.perform(post("/mySampleTopic").header("x-amz-sns-message-type", "SubscriptionConfirmation")
 						.contentType(MediaType.APPLICATION_JSON)
@@ -110,7 +110,7 @@ void testSubscriptionConfirmation() throws Exception {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	void testNotification() throws Exception {
+	void notification() throws Exception {
 		this.mockMvc
 				.perform(post("/mySampleTopic").header("x-amz-sns-message-type", "Notification")
 						.contentType(MediaType.TEXT_PLAIN)
@@ -121,12 +121,13 @@ void testNotification() throws Exception {
 		assertThat(receive).isNotNull();
 		Map<String, String> payload = (Map<String, String>) receive.getPayload();
 
-		assertThat(payload.get("Subject")).isEqualTo("foo");
-		assertThat(payload.get("Message")).isEqualTo("bar");
+		assertThat(payload)
+				.containsEntry("Subject", "foo")
+				.containsEntry("Message", "bar");
 	}
 
 	@Test
-	void testUnsubscribe() throws Exception {
+	void unsubscribe() throws Exception {
 		this.mockMvc
 				.perform(post("/mySampleTopic").header("x-amz-sns-message-type", "UnsubscribeConfirmation")
 						.contentType(MediaType.TEXT_PLAIN)

src/test/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapterTests.java

@@ -43,7 +43,7 @@
  */
 @SpringJUnitConfig
 @DirtiesContext
-public class SqsMessageDrivenChannelAdapterTests implements LocalstackContainerTest {
+class SqsMessageDrivenChannelAdapterTests implements LocalstackContainerTest {
 
 	private static SqsAsyncClient AMAZON_SQS;
 
@@ -59,7 +59,7 @@ static void setup() {
 	}
 
 	@Test
-	void testSqsMessageDrivenChannelAdapter() {
+	void sqsMessageDrivenChannelAdapter() {
 		Map<String, MessageAttributeValue> attributes =
 				Map.of("someAttribute",
 						MessageAttributeValue.builder()

src/test/java/org/springframework/integration/aws/kinesis/KclMessageDrivenChannelAdapterMultiStreamTests.java

@@ -53,8 +53,7 @@
  */
 @SpringJUnitConfig
 @DirtiesContext
-
-public class KclMessageDrivenChannelAdapterMultiStreamTests implements LocalstackContainerTest {
+class KclMessageDrivenChannelAdapterMultiStreamTests implements LocalstackContainerTest {
 
 	private static final String TEST_STREAM1 = "MultiStreamKcl1";
 
@@ -104,7 +103,7 @@ static void tearDown() {
 	}
 
 	@Test
-	public void kclChannelAdapterMultiStream() {
+	void kclChannelAdapterMultiStream() {
 		String testData = "test data";
 		AMAZON_KINESIS.putRecord(request -> request
 				.streamName(TEST_STREAM1)

src/test/java/org/springframework/integration/aws/kinesis/KclMessageDrivenChannelAdapterTests.java

@@ -161,7 +161,7 @@ private Message<?> verifyRecordReceived(String testData) {
 	}
 
 	@Test
-	public void metricsLevelOfMetricsConfigShouldBeSetToMetricsLevelOfAdapter() {
+	void metricsLevelOfMetricsConfigShouldBeSetToMetricsLevelOfAdapter() {
 		MetricsLevel metricsLevel =
 				TestUtils.getPropertyValue(this.kclMessageDrivenChannelAdapter,
 						"scheduler.metricsConfig.metricsLevel",
@@ -170,7 +170,7 @@ public void metricsLevelOfMetricsConfigShouldBeSetToMetricsLevelOfAdapter() {
 	}
 
 	@Test
-	public void metricsFactoryOfSchedulerShouldBeSetNullMetricsFactoryIfMetricsLevelIsNone() {
+	void metricsFactoryOfSchedulerShouldBeSetNullMetricsFactoryIfMetricsLevelIsNone() {
 		MetricsFactory metricsFactory =
 				TestUtils.getPropertyValue(this.kclMessageDrivenChannelAdapter,
 						"scheduler.metricsFactory",
@@ -179,7 +179,7 @@ public void metricsFactoryOfSchedulerShouldBeSetNullMetricsFactoryIfMetricsLevel
 	}
 
 	@Test
-	public void maxLeasesForWorkerOverriddenByCustomizer() {
+	void maxLeasesForWorkerOverriddenByCustomizer() {
 		Integer maxLeasesForWorker =
 				TestUtils.getPropertyValue(this.kclMessageDrivenChannelAdapter,
 						"scheduler.leaseCoordinator.leaseTaker.maxLeasesForWorker",
@@ -188,7 +188,7 @@ public void maxLeasesForWorkerOverriddenByCustomizer() {
 	}
 
 	@Test
-	public void shardConsumerDispatchPollIntervalMillisOverriddenByCustomizer() {
+	void shardConsumerDispatchPollIntervalMillisOverriddenByCustomizer() {
 		Long shardConsumerDispatchPollIntervalMillis =
 				TestUtils.getPropertyValue(this.kclMessageDrivenChannelAdapter,
 						"scheduler.shardConsumerDispatchPollIntervalMillis",
@@ -197,7 +197,7 @@ public void shardConsumerDispatchPollIntervalMillisOverriddenByCustomizer() {
 	}
 
 	@Test
-	public void pollingMaxRecordsIsPropagated() {
+	void pollingMaxRecordsIsPropagated() {
 		Integer maxRecords =
 				TestUtils.getPropertyValue(this.kclMessageDrivenChannelAdapter,
 						"scheduler.retrievalConfig.retrievalSpecificConfig.maxRecords",

src/test/java/org/springframework/integration/aws/kinesis/KinesisIntegrationTests.java

@@ -65,7 +65,7 @@
  */
 @SpringJUnitConfig
 @DirtiesContext
-public class KinesisIntegrationTests implements LocalstackContainerTest {
+class KinesisIntegrationTests implements LocalstackContainerTest {
 
 	private static final String TEST_STREAM = "TestStream";
 
@@ -95,7 +95,7 @@ static void tearDown() {
 	}
 
 	@Test
-	void testKinesisInboundOutbound() {
+	void kinesisInboundOutbound() {
 		this.kinesisSendChannel
 				.send(MessageBuilder.withPayload("foo").setHeader(AwsHeaders.STREAM, TEST_STREAM).build());
 
@@ -138,7 +138,7 @@ void testKinesisInboundOutbound() {
 			assertThat(receivedSequences.add(sequenceNumber)).isTrue();
 		}
 
-		assertThat(receivedSequences.size()).isEqualTo(2);
+		assertThat(receivedSequences).hasSize(2);
 
 		receive = this.kinesisReceiveChannel.receive(10);
 		assertThat(receive).isNull();

src/test/java/org/springframework/integration/aws/kinesis/KplKclIntegrationTests.java

@@ -68,7 +68,7 @@
 @Disabled("Depends on real call to http://169.254.169.254 through native library")
 @SpringJUnitConfig
 @DirtiesContext
-public class KplKclIntegrationTests implements LocalstackContainerTest {
+class KplKclIntegrationTests implements LocalstackContainerTest {
 
 	private static final String TEST_STREAM = "TestStreamKplKcl";
 
@@ -105,7 +105,7 @@ static void tearDown() {
 	}
 
 	@Test
-	void testKinesisInboundOutbound() {
+	void kinesisInboundOutbound() {
 		this.kinesisSendChannel
 				.send(MessageBuilder.withPayload("foo").setHeader(AwsHeaders.STREAM, TEST_STREAM).build());
 

src/test/java/org/springframework/integration/aws/leader/DynamoDbLockRegistryLeaderInitiatorTests.java

@@ -75,7 +75,7 @@ static void destroy() {
 	}
 
 	@Test
-	void testDistributedLeaderElection() throws Exception {
+	void distributedLeaderElection() throws Exception {
 		CountDownLatch granted = new CountDownLatch(1);
 		CountingPublisher countingPublisher = new CountingPublisher(granted);
 		List<DynamoDbLockRepository> repositories = new ArrayList<>();
@@ -176,7 +176,7 @@ void testDistributedLeaderElection() throws Exception {
 	}
 
 	@Test
-	void testLostConnection() throws Exception {
+	void lostConnection() throws Exception {
 		CountDownLatch granted = new CountDownLatch(1);
 		CountingPublisher countingPublisher = new CountingPublisher(granted);