Skip to content

Commit

Permalink
refactor: int-aws testFixtures with ParserTestBase
Browse files Browse the repository at this point in the history
  • Loading branch information
boolivar committed Jan 11, 2025
1 parent 6707576 commit b560910
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 38 deletions.
4 changes: 0 additions & 4 deletions buildSrc/src/main/groovy/java-conventions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ tasks.named("check") {
dependsOn "jdocSpockTest"
}

tasks.named("jar") {
dependsOn "check"
}

checkstyle {
configDirectory = file("$rootDir/gradle/config/checkstyle")
toolVersion = com.puppycrawl.tools.checkstyle.Checker.package.implementationVersion
Expand Down
2 changes: 1 addition & 1 deletion int-aws-support/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
compileOnly "org.springframework.integration:spring-integration-file"
compileOnly "org.springframework.integration:spring-integration-http"

testImplementation project(":parser-test")
testImplementation testFixtures(project(":int-aws"))
testImplementation "software.amazon.awssdk:s3-transfer-manager"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.S3InboundFileSynchronizer;
import org.springframework.integration.aws.inbound.S3InboundFileSynchronizingMessageSource;
import org.springframework.integration.aws.support.S3SessionFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.S3StreamingMessageSource;
import org.springframework.integration.aws.support.S3RemoteFileTemplate;
import org.springframework.integration.aws.support.S3SessionFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.S3MessageHandler;
import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
import org.springframework.messaging.Message;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.S3MessageHandler;
import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
import org.springframework.integration.channel.DirectChannel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.SnsInboundChannelAdapter;
import software.amazon.awssdk.services.sns.SnsClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.SnsMessageHandler;
import software.amazon.awssdk.services.sns.SnsAsyncClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.SqsMessageDrivenChannelAdapter;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.core.DestinationResolver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.SqsMessageHandler;
import org.springframework.messaging.converter.MessageConverter;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
Expand Down
8 changes: 7 additions & 1 deletion int-aws/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id "java-conventions"
id "java-test-fixtures"
}

dependencies {
Expand All @@ -13,7 +14,12 @@ dependencies {
compileOnly "org.springframework.integration:spring-integration-file"
compileOnly "software.amazon.kinesis:amazon-kinesis-client:2.6.0"

testImplementation project(":parser-test")
testFixturesApi "io.github.boolivar:mockito-inline-extension"
testFixturesApi "org.mockito:mockito-junit-jupiter"

testFixturesImplementation platform(project(":platform"))
testFixturesImplementation "commons-io:commons-io"
testFixturesImplementation "org.springframework:spring-context"

testRuntimeOnly "software.amazon.awssdk:s3-transfer-manager"
testRuntimeOnly "jakarta.servlet:jakarta.servlet-api"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +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.config.xml.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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +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.config.xml.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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.KinesisMessageHandler;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.messaging.converter.MessageConverter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.KplMessageHandler;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.messaging.converter.MessageConverter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.S3InboundFileSynchronizer;
import org.springframework.integration.aws.inbound.S3InboundFileSynchronizingMessageSource;
import org.springframework.integration.channel.DirectChannel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.S3StreamingMessageSource;
import org.springframework.integration.aws.support.S3RemoteFileTemplate;
import org.springframework.integration.aws.support.S3SessionFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.S3MessageHandler;
import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
import org.springframework.messaging.Message;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.S3MessageHandler;
import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
import org.springframework.integration.channel.DirectChannel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.SnsInboundChannelAdapter;
import software.amazon.awssdk.services.sns.SnsClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.SnsMessageHandler;
import software.amazon.awssdk.services.sns.SnsAsyncClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.inbound.SqsMessageDrivenChannelAdapter;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.config.xml.test.ParserTestBase;
import org.springframework.integration.aws.outbound.SqsMessageHandler;
import org.springframework.messaging.converter.MessageConverter;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.springframework.integration.aws.config.xml.parsers.test;
package org.springframework.integration.aws.config.xml.test;

import org.bool.junit.mockito.inline.MockitoInlineExtension;

Expand Down
11 changes: 0 additions & 11 deletions parser-test/build.gradle

This file was deleted.

0 comments on commit b560910

Please sign in to comment.