refactor(int-aws): ParserTestBase from parser-test module

boolivar · boolivar · commit 67075767b640 · 2025-01-10T23:54:02.000+02:00
diff --git a/int-aws/build.gradle b/int-aws/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     compileOnly "org.springframework.integration:spring-integration-file"
     compileOnly "software.amazon.kinesis:amazon-kinesis-client:2.6.0"
 
-    testImplementation "io.github.boolivar:mockito-inline-extension"
+    testImplementation project(":parser-test")
 
     testRuntimeOnly "software.amazon.awssdk:s3-transfer-manager"
     testRuntimeOnly "jakarta.servlet:jakarta.servlet-api"
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KclMessageDrivenChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KclMessageDrivenChannelAdapterParserTest.java
@@ -12,6 +12,7 @@
 import org.mockito.MockedStatic;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.inbound.kinesis.CheckpointMode;
 import org.springframework.integration.aws.inbound.kinesis.KclMessageDrivenChannelAdapter;
 import org.springframework.integration.aws.inbound.kinesis.ListenerMode;
@@ -53,10 +54,13 @@ class KclMessageDrivenChannelAdapterParserTest extends ParserTestBase {
 
     @Test
     void testDefaults(MockedConstruction<KclMessageDrivenChannelAdapter> mocked) {
-        var adapter = loadBean(KclMessageDrivenChannelAdapter.class, """
+        parse("""
                 <int-aws:kcl-message-driven-channel-adapter streams="s"
                         channel="c"/>
             """);
+
+        var adapter = getBean(KclMessageDrivenChannelAdapter.class);
+
         assertThat(mocked.constructed())
             .singleElement().isSameAs(adapter);
     }
@@ -75,12 +79,14 @@ void testKinesisClientConfig(MockedConstruction<KclMessageDrivenChannelAdapter>
         dynamoDbMock.when(DynamoDbAsyncClient::create).thenReturn(dynamoDbClient);
         cloudWatchMock.when(CloudWatchAsyncClient::create).thenReturn(cloudWatchClient);
 
-        var adapter = loadBean(KclMessageDrivenChannelAdapter.class, """
+        parse("""
                 <int-aws:kcl-message-driven-channel-adapter streams="s"
                         channel="c"
                         kinesis-client="kc"/>
             """);
 
+        var adapter = getBean(KclMessageDrivenChannelAdapter.class);
+
         assertThat(mocked.constructed())
             .singleElement().isSameAs(adapter);
     }
@@ -101,7 +107,7 @@ void testAdapter() {
         registerBean("gsrd", GlueSchemaRegistryDeserializer.class, glueSchemaRegistryDeserializer);
         registerBean("sis", InitialPositionInStreamExtended.class, streamInitialSequence);
 
-        var adapter = loadBean(KclMessageDrivenChannelAdapter.class, """
+        parse("""
             <int-aws:kcl-message-driven-channel-adapter streams="s"
                     id="i"
                     channel="c"
@@ -131,6 +137,8 @@ void testAdapter() {
                     worker-id="wid"/>
             """);
 
+        var adapter = getBean(KclMessageDrivenChannelAdapter.class);
+
         verify(adapter).setBindSourceRecord(true);
         verify(adapter).setCheckpointMode(CheckpointMode.batch);
         verify(adapter).setCheckpointsInterval(70L);
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KinesisMessageDrivenChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KinesisMessageDrivenChannelAdapterParserTest.java
@@ -7,6 +7,7 @@
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.inbound.kinesis.CheckpointMode;
 import org.springframework.integration.aws.inbound.kinesis.KinesisMessageDrivenChannelAdapter;
 import org.springframework.integration.aws.inbound.kinesis.KinesisShardOffset;
@@ -65,7 +66,7 @@ void testAdapter() {
         registerBean("slf", Function.class, shardListFilter);
         registerBean("sis", KinesisShardOffset.class, streamInitialSequence);
 
-        var adapter = loadBean(KinesisMessageDrivenChannelAdapter.class, """
+        parse("""
             <int-aws:kinesis-message-driven-channel-adapter kinesis-client="kc" streams="a,b,c"
                     id="i"
                     channel="c"
@@ -92,6 +93,8 @@ void testAdapter() {
                     stream-initial-sequence="sis"/>
             """);
 
+        var adapter = getBean(KinesisMessageDrivenChannelAdapter.class);
+
         verify(adapter).setBindSourceRecord(true);
         verify(adapter).setCheckpointMode(CheckpointMode.batch);
         verify(adapter).setCheckpointStore(checkpointStore);
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KinesisOutboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KinesisOutboundChannelAdapterParserTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.outbound.KinesisMessageHandler;
 import org.springframework.integration.mapping.OutboundMessageMapper;
 import org.springframework.messaging.converter.MessageConverter;
@@ -30,7 +31,7 @@ void testMessageHandler() {
         registerBean("ehm", OutboundMessageMapper.class, messageMapper);
         registerBean("mc", MessageConverter.class, messageConverter);
 
-        var handler = loadBean(KinesisMessageHandler.class, """
+        parse("""
             <int-aws:kinesis-outbound-channel-adapter kinesis-client="kc"
                     id="i"
                     channel="c"
@@ -46,6 +47,8 @@ void testMessageHandler() {
                     sequence-number-expression="headers.exp"/>
             """);
 
+        var handler = getBean(KinesisMessageHandler.class);
+
         verify(handler).setStream("s");
         verify(handler).setAsync(true);
         verify(handler).setEmbeddedHeadersMapper(messageMapper);
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KplOutboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/KplOutboundChannelAdapterParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.outbound.KplMessageHandler;
 import org.springframework.integration.mapping.OutboundMessageMapper;
 import org.springframework.messaging.converter.MessageConverter;
@@ -32,7 +33,7 @@ void testMessageHandler() {
         registerBean("ehm", OutboundMessageMapper.class, messageMapper);
         registerBean("mc", MessageConverter.class, messageConverter);
 
-        var handler = loadBean(KplMessageHandler.class, """
+        parse("""
             <int-aws:kpl-outbound-channel-adapter kinesis-producer="kp"
                     id="i"
                     channel="c"
@@ -50,6 +51,8 @@ void testMessageHandler() {
                     sequence-number-expression="headers.exp"/>
             """);
 
+        var handler = getBean(KplMessageHandler.class);
+
         verify(handler).setStream("s");
         verify(handler).setAsync(true);
         verify(handler).setEmbeddedHeadersMapper(messageMapper);
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/ParserTestBase.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/ParserTestBase.java
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3InboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3InboundChannelAdapterParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.inbound.S3InboundFileSynchronizer;
 import org.springframework.integration.aws.inbound.S3InboundFileSynchronizingMessageSource;
 import org.springframework.integration.channel.DirectChannel;
@@ -52,7 +53,7 @@ void testAdapter() {
         registerBean("cmp", Comparator.class, comparator);
         registerBean("scn", DirectoryScanner.class, scanner);
 
-        var messageSource = loadBean(S3InboundFileSynchronizingMessageSource.class, """
+        parse("""
             <int-aws:s3-inbound-channel-adapter
                     id="s3ica"
                     channel="c"
@@ -74,6 +75,8 @@ void testAdapter() {
                     comparator="cmp"/>
             """);
 
+        var messageSource = getBean(S3InboundFileSynchronizingMessageSource.class);
+
         verify(messageSource).setLocalDirectory(new File("local"));
         verify(messageSource).setScanner(scanner);
         verify(messageSource).setLocalFilter(fileListFilter);
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3InboundStreamingChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3InboundStreamingChannelAdapterParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.inbound.S3StreamingMessageSource;
 import org.springframework.integration.aws.support.S3RemoteFileTemplate;
 import org.springframework.integration.aws.support.S3SessionFactory;
@@ -32,7 +33,7 @@ void testAdapter() {
         registerBean("sf", S3SessionFactory.class, sessionFactory);
         registerBean("cmp", Comparator.class, comparator);
 
-        var messageSource = loadBean(S3StreamingMessageSource.class, """
+        parse("""
             <int-aws:s3-inbound-streaming-channel-adapter
                     id="s3isca"
                     channel="c"
@@ -46,6 +47,8 @@ void testAdapter() {
                     />
             """);
 
+        var messageSource = getBean(S3StreamingMessageSource.class);
+
         verify(messageSource).setMaxFetchSize(10);
         verify(messageSource).setRemoteDirectoryExpression(assertArg(e -> assertThat(e.getExpressionString()).isEqualTo("remote")));
         verify(messageSource).setRemoteFileSeparator(";");
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3OutboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3OutboundChannelAdapterParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.outbound.S3MessageHandler;
 import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
 import org.springframework.messaging.Message;
@@ -30,7 +31,7 @@ void testMessageHandler() {
         registerBean("sss", S3AsyncClient.class, s3Client);
         registerBean("ump", BiConsumer.class, uploadMetadataProvider);
 
-        var handler = loadBean(S3MessageHandler.class, """
+        parse("""
             <int-aws:s3-outbound-channel-adapter
                     id="s3out"
                     channel="c"
@@ -45,6 +46,8 @@ void testMessageHandler() {
                     />
             """);
 
+        var handler = getBean(S3MessageHandler.class);
+
         verify(handler).setCommand(Command.COPY);
         verify(handler).setKeyExpression(argThat(e -> "key.exp".equals(e.getExpressionString())));
         verify(handler).setDestinationKeyExpression(argThat(e -> "dest.key.exp".equals(e.getExpressionString())));
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3OutboundGatewayParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/S3OutboundGatewayParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.outbound.S3MessageHandler;
 import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
 import org.springframework.integration.channel.DirectChannel;
@@ -32,7 +33,7 @@ void testMessageHandler() {
         registerBean("ump", BiConsumer.class, uploadMetadataProvider);
         registerBean("rq", DirectChannel.class, new DirectChannel());
 
-        var handler = loadBean(S3MessageHandler.class, """
+        parse("""
             <int-aws:s3-outbound-gateway
                     id="s3gw"
                     s3="sss"
@@ -49,6 +50,8 @@ void testMessageHandler() {
                     upload-metadata-provider="ump"/>
             """);
 
+        var handler = getBean(S3MessageHandler.class);
+
         verify(handler).setAsync(true);
         verify(handler).setCommand(Command.COPY);
         verify(handler).setKeyExpression(argThat(e -> "key.exp".equals(e.getExpressionString())));
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SnsInboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SnsInboundChannelAdapterParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.inbound.SnsInboundChannelAdapter;
 import software.amazon.awssdk.services.sns.SnsClient;
 
@@ -21,7 +22,7 @@ class SnsInboundChannelAdapterParserTest extends ParserTestBase {
     void testAdapter() {
         registerBean("sns", SnsClient.class, sns);
 
-        var adapter = loadBean(SnsInboundChannelAdapter.class, """
+        parse("""
             <int-aws:sns-inbound-channel-adapter
                     auto-startup="#{false}"
                     id="snsica"
@@ -34,6 +35,8 @@ void testAdapter() {
                     send-timeout="#{50}"/>
             """);
 
+        var adapter = getBean(SnsInboundChannelAdapter.class);
+
         verify(adapter).setBeanName("snsica");
         verify(adapter).setAutoStartup(false);
         verify(adapter).setRequestChannelName("c");
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SnsOutboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SnsOutboundChannelAdapterParserTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.outbound.SnsMessageHandler;
 import software.amazon.awssdk.services.sns.SnsAsyncClient;
 
@@ -21,7 +22,7 @@ class SnsOutboundChannelAdapterParserTest extends ParserTestBase {
     void testHandler() {
         registerBean("sns", SnsAsyncClient.class, sns);
 
-        var handler = loadBean(SnsMessageHandler.class, """
+        parse("""
             <int-aws:sns-outbound-channel-adapter
                     id="snsoca"
                     channel="c"
@@ -37,6 +38,8 @@ void testHandler() {
                     send-timeout="#{50}"/>
             """);
 
+        var handler = getBean(SnsMessageHandler.class);
+
         verify(handler).setTopicArn("arn");
         verify(handler).setSubject("subj");
         verify(handler).setMessageGroupId("groupid");
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SqsMessageDrivenChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SqsMessageDrivenChannelAdapterParserTest.java
@@ -17,6 +17,7 @@
 import org.mockito.Mock;
 import org.mockito.MockedConstruction.Context;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.integration.aws.config.xml.parsers.test.ParserTestBase;
 import org.springframework.integration.aws.inbound.SqsMessageDrivenChannelAdapter;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 
@@ -45,7 +46,7 @@ void testBeanDefinition() {
         registerBean("mc", MessagingMessageConverter.class, messageConverter);
         registerBean("ex", TaskExecutor.class, taskExecutor);
 
-        var adapter = loadBean(SqsMessageDrivenChannelAdapter.class, """
+        parse("""
             <int-aws:sqs-message-driven-channel-adapter queues="q" sqs="sqs"
                     id="i"
                     channel="c"
@@ -69,6 +70,8 @@ void testBeanDefinition() {
                     components-task-executor="ex"/>
             """);
 
+        var adapter = getBean(SqsMessageDrivenChannelAdapter.class);
+
         verify(adapter).setBeanName("i");
         verify(adapter).setOutputChannelName("c");
         verify(adapter).setErrorChannelName("ec");
diff --git a/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SqsOutboundChannelAdapterParserTest.java b/int-aws/src/test/java/org/springframework/integration/aws/config/xml/parsers/SqsOutboundChannelAdapterParserTest.java
