From cccd8e12571b1cbb337e54260cb37d24d1f3b3de Mon Sep 17 00:00:00 2001 From: Rashidi Zin Date: Fri, 28 Feb 2025 14:34:22 +0800 Subject: [PATCH] Replace `@SpringJUnitConfig` with `@SpringBootTest` --- batch-rest-repository/README.adoc | 2 +- .../batch/rest/user/UserBatchJobTests.java | 26 +++++++++---------- batch-skip-step/README.adoc | 4 +-- .../boot/batch/user/UserBatchJobTests.java | 8 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/batch-rest-repository/README.adoc b/batch-rest-repository/README.adoc index 8bb1bdd7..5df65d11 100644 --- a/batch-rest-repository/README.adoc +++ b/batch-rest-repository/README.adoc @@ -103,7 +103,7 @@ Once completed then we will verify that the database contains the expected numbe ---- @Testcontainers @SpringBatchTest -@SpringJUnitConfig({ BatchTestConfiguration.class, MongoTestConfiguration.class, UserJobConfiguration.class }) +@SpringBootTest(classes = { BatchTestConfiguration.class, MongoTestConfiguration.class, UserJobConfiguration.class }, webEnvironment = NONE) class UserBatchJobTests { @Container diff --git a/batch-rest-repository/src/test/java/zin/rashidi/boot/batch/rest/user/UserBatchJobTests.java b/batch-rest-repository/src/test/java/zin/rashidi/boot/batch/rest/user/UserBatchJobTests.java index 0d8261c1..9dd13e90 100644 --- a/batch-rest-repository/src/test/java/zin/rashidi/boot/batch/rest/user/UserBatchJobTests.java +++ b/batch-rest-repository/src/test/java/zin/rashidi/boot/batch/rest/user/UserBatchJobTests.java @@ -1,14 +1,7 @@ package zin.rashidi.boot.batch.rest.user; -import static java.time.Duration.ofSeconds; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.batch.core.ExitStatus.COMPLETED; -import static org.testcontainers.shaded.org.awaitility.Awaitility.await; -import static zin.rashidi.boot.batch.rest.user.UserBatchJobTests.BatchTestConfiguration; -import static zin.rashidi.boot.batch.rest.user.UserBatchJobTests.MongoTestConfiguration; - -import javax.sql.DataSource; - +import com.mongodb.ConnectionString; +import com.mongodb.MongoClientSettings; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration; @@ -16,28 +9,35 @@ import org.springframework.batch.test.context.SpringBatchTest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.jdbc.support.JdbcTransactionManager; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.PlatformTransactionManager; import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import com.mongodb.ConnectionString; -import com.mongodb.MongoClientSettings; +import javax.sql.DataSource; + +import static java.time.Duration.ofSeconds; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.batch.core.ExitStatus.COMPLETED; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; +import static org.testcontainers.shaded.org.awaitility.Awaitility.await; +import static zin.rashidi.boot.batch.rest.user.UserBatchJobTests.BatchTestConfiguration; +import static zin.rashidi.boot.batch.rest.user.UserBatchJobTests.MongoTestConfiguration; /** * @author Rashidi Zin */ @Testcontainers @SpringBatchTest -@SpringJUnitConfig({ BatchTestConfiguration.class, MongoTestConfiguration.class, UserJobConfiguration.class }) +@SpringBootTest(classes = { BatchTestConfiguration.class, MongoTestConfiguration.class, UserJobConfiguration.class }, webEnvironment = NONE) class UserBatchJobTests { @Container diff --git a/batch-skip-step/README.adoc b/batch-skip-step/README.adoc index 009aacd5..41c668d3 100644 --- a/batch-skip-step/README.adoc +++ b/batch-skip-step/README.adoc @@ -107,11 +107,11 @@ We will implement integration tests to verify that our implementation is working ---- @Testcontainers @SpringBatchTest -@SpringJUnitConfig({ +@SpringBootTest(classes = { BatchTestConfiguration.class, JdbcTestConfiguration.class, UserJobConfiguration.class -}) +}, webEnvironment = NONE) @Sql( scripts = { "classpath:org/springframework/batch/core/schema-drop-mysql.sql", diff --git a/batch-skip-step/src/test/java/zin/rashidi/boot/batch/user/UserBatchJobTests.java b/batch-skip-step/src/test/java/zin/rashidi/boot/batch/user/UserBatchJobTests.java index 07ca3ec8..db97c41d 100644 --- a/batch-skip-step/src/test/java/zin/rashidi/boot/batch/user/UserBatchJobTests.java +++ b/batch-skip-step/src/test/java/zin/rashidi/boot/batch/user/UserBatchJobTests.java @@ -8,13 +8,13 @@ import org.springframework.batch.test.context.SpringBatchTest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.JdbcTransactionManager; import org.springframework.test.context.jdbc.Sql; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.PlatformTransactionManager; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -25,8 +25,8 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.batch.core.ExitStatus.COMPLETED; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; import static org.testcontainers.shaded.org.awaitility.Awaitility.await; - import static zin.rashidi.boot.batch.user.UserBatchJobTests.BatchTestConfiguration; import static zin.rashidi.boot.batch.user.UserBatchJobTests.JdbcTestConfiguration; @@ -35,11 +35,11 @@ */ @Testcontainers @SpringBatchTest -@SpringJUnitConfig({ +@SpringBootTest(classes = { BatchTestConfiguration.class, JdbcTestConfiguration.class, UserJobConfiguration.class -}) +}, webEnvironment = NONE) @Sql( scripts = { "classpath:org/springframework/batch/core/schema-drop-mysql.sql",