Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion batch-rest-repository/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
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;
import org.springframework.batch.test.JobLauncherTestUtils;
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
Expand Down
4 changes: 2 additions & 2 deletions batch-skip-step/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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",
Expand Down
Loading