From 8ca9802da47fe3506a742f71d5feba6ca998d8d4 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Tue, 10 May 2022 13:36:45 -0400 Subject: [PATCH] Remove the JUnit dependency in AssertFile The side effect is a breaking change in that it will now throw IllegalStateException instead of the Compare and AssertExceptions provided by JUnit. Resolves #4111 --- spring-batch-samples/pom.xml | 13 +--- .../batch/sample/AMQPJobFunctionalTests.java | 7 ++- ...WrapperMapperSampleJobFunctionalTests.java | 8 ++- ...positeItemWriterSampleFunctionalTests.java | 30 ++++----- .../CustomerFilterJobFunctionalTests.java | 35 ++++++----- .../DatabaseShutdownFunctionalTests.java | 16 ++--- .../sample/DelegatingJobFunctionalTests.java | 13 ++-- .../sample/FootballJobFunctionalTests.java | 16 ++--- .../GracefulShutdownFunctionalTests.java | 20 +++--- .../sample/GroovyJobFunctionalTests.java | 27 ++++---- .../HeaderFooterSampleFunctionalTests.java | 16 +++-- .../HibernateFailureJobFunctionalTests.java | 33 +++++----- .../sample/JobOperatorFunctionalTests.java | 23 +++---- .../batch/sample/JobStepFunctionalTests.java | 17 +++-- .../sample/JsonSupportIntegrationTests.java | 1 + .../sample/LoopFlowSampleFunctionalTests.java | 14 +++-- .../batch/sample/MailJobFunctionalTests.java | 22 ++++--- .../sample/MultilineJobFunctionalTests.java | 8 ++- .../MultilineOrderJobFunctionalTests.java | 12 ++-- .../sample/ParallelJobFunctionalTests.java | 17 ++--- .../PartitionFileJobFunctionalTests.java | 25 ++++---- .../PartitionJdbcJobFunctionalTests.java | 25 ++++---- .../RemoteChunkingJobFunctionalTests.java | 10 ++- .../RemotePartitioningJobFunctionalTests.java | 10 ++- .../RestartFileSampleFunctionalTests.java | 14 +++-- .../batch/sample/RestartFunctionalTests.java | 18 +++--- .../sample/RetrySampleConfigurationTests.java | 13 ++-- .../sample/RetrySampleFunctionalTests.java | 14 +++-- .../sample/SkipSampleFunctionalTests.java | 38 +++++------- .../sample/TaskletJobFunctionalTests.java | 11 ++-- .../batch/sample/TradeJobFunctionalTests.java | 35 ++++++----- .../common/ColumnRangePartitionerTests.java | 21 ++++--- .../sample/common/CustomItemReaderTests.java | 13 ++-- .../sample/common/CustomItemWriterTests.java | 14 ++--- ...ExceptionThrowingItemReaderProxyTests.java | 10 +-- .../common/OutputFileListenerTests.java | 1 + .../sample/common/StagingItemReaderTests.java | 19 +++--- .../sample/common/StagingItemWriterTests.java | 17 ++--- .../internal/JdbcGameDaoIntegrationTests.java | 26 ++++---- .../JdbcPlayerDaoIntegrationTests.java | 21 ++++--- .../JdbcPlayerSummaryDaoIntegrationTests.java | 19 +++--- .../AggregateItemFieldSetMapperTests.java | 7 +-- .../multiline/AggregateItemReaderTests.java | 12 ++-- .../domain/multiline/AggregateItemTests.java | 7 +-- .../domain/order/OrderItemReaderTests.java | 11 ++-- .../validator/OrderValidatorTests.java | 25 ++++---- ...ositeCustomerUpdateLineTokenizerTests.java | 7 ++- .../trade/CustomerUpdateProcessorTests.java | 15 +++-- .../batch/sample/domain/trade/TradeTests.java | 4 +- .../CustomerCreditIncreaseProcessorTests.java | 7 ++- ...ditUpdatePreparedStatementSetterTests.java | 1 + .../CustomerCreditUpdateProcessorTests.java | 10 ++- .../CustomerUpdateProcessorTests.java | 10 ++- .../FlatFileCustomerCreditDaoTests.java | 10 ++- .../internal/GeneratingItemReaderTests.java | 9 ++- .../internal/JdbcCustomerDebitDaoTests.java | 22 ++++--- .../trade/internal/JdbcTradeWriterTests.java | 22 ++++--- .../trade/internal/TradeProcessorTests.java | 7 +-- .../iosample/AbstractIoSampleTests.java | 3 +- .../iosample/DelimitedFunctionalTests.java | 8 ++- .../iosample/FixedLengthFunctionalTests.java | 7 ++- .../iosample/HibernateFunctionalTests.java | 8 ++- .../iosample/JdbcCursorFunctionalTests.java | 8 ++- .../iosample/JdbcPagingFunctionalTests.java | 7 ++- .../sample/iosample/JpaFunctionalTests.java | 8 ++- .../iosample/MultiLineFunctionalTests.java | 9 ++- .../MultiRecordTypeFunctionalTests.java | 10 ++- .../MultiResourceFunctionalTests.java | 8 ++- .../iosample/RepositoryFunctionalTests.java | 8 ++- ...oJobInstancesDelimitedFunctionalTests.java | 10 ++- .../TwoJobInstancesPagingFunctionalTests.java | 27 ++++---- .../sample/iosample/XmlFunctionalTests.java | 9 ++- ...obExecutionNotificationPublisherTests.java | 16 ++--- .../sample/launch/RemoteLauncherTests.java | 19 +++--- .../quartz/JobLauncherDetailsTests.java | 21 ++++--- .../support/AbstractFieldSetMapperTests.java | 1 + .../support/AbstractRowMapperTests.java | 3 + .../support/ItemTrackingItemWriterTests.java | 15 +++-- .../support/RetrySampleItemWriterTests.java | 10 +-- .../ValidationSampleFunctionalTests.java | 13 ++-- .../batch/test/AssertFile.java | 25 +++++--- .../batch/test/AssertFileTests.java | 62 +++++++++++++------ 82 files changed, 690 insertions(+), 533 deletions(-) diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml index 08cf0d5fe..c6f8f406a 100644 --- a/spring-batch-samples/pom.xml +++ b/spring-batch-samples/pom.xml @@ -158,22 +158,11 @@ spring-batch-test test - - junit - junit - ${junit.version} - test - - - org.hamcrest - hamcrest-core - - - org.junit.jupiter junit-jupiter-engine ${junit-jupiter.version} + test org.hamcrest diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java index 609a02987..c0ba7777a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AMQPJobFunctionalTests.java @@ -19,11 +19,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.core.explore.JobExplorer; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** *

@@ -39,7 +41,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; *

*/ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/amqp-example-job.xml", "/job-runner-context.xml" }) class AMQPJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java index 8595d981d..e313d1084 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java @@ -17,13 +17,15 @@ package org.springframework.batch.sample; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/beanWrapperMapperSampleJob.xml", +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/beanWrapperMapperSampleJob.xml", "/job-runner-context.xml" }) class BeanWrapperMapperSampleJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java index b5c20462f..e2b618924 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java @@ -15,6 +15,20 @@ */ package org.springframework.batch.sample; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.Job; +import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.test.JobLauncherTestUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.jdbc.JdbcTestUtils; + +import javax.sql.DataSource; import java.io.FileInputStream; import java.io.IOException; import java.math.BigDecimal; @@ -22,23 +36,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import javax.sql.DataSource; - -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; - -import org.springframework.batch.core.Job; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.test.JobLauncherTestUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import org.springframework.test.jdbc.JdbcTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/compositeItemWriterSampleJob.xml", +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/compositeItemWriterSampleJob.xml", "/job-runner-context.xml" }) class CompositeItemWriterSampleFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java index 43ff6ddaf..4f4abe319 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CustomerFilterJobFunctionalTests.java @@ -16,8 +16,21 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.test.JobLauncherTestUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.jdbc.JdbcTestUtils; +import javax.sql.DataSource; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Arrays; @@ -25,22 +38,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.sql.DataSource; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.test.JobLauncherTestUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import org.springframework.test.jdbc.JdbcTestUtils; - -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/customerFilterJob.xml", "/job-runner-context.xml" }) class CustomerFilterJobFunctionalTests { @@ -95,7 +96,7 @@ class CustomerFilterJobFunctionalTests { jdbcTemplate.query(GET_CUSTOMERS, new RowCallbackHandler() { @Override public void processRow(ResultSet rs) throws SQLException { - Customer customer = customers.get(activeRow++); + CustomerFilterJobFunctionalTests.Customer customer = customers.get(activeRow++); assertEquals(customer.getName(), rs.getString(1)); assertEquals(customer.getCredit(), rs.getDouble(2), .01); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java index a409a26fa..991c618de 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DatabaseShutdownFunctionalTests.java @@ -16,21 +16,20 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.launch.JobOperator; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.*; /** * Functional test for graceful shutdown. A batch container is started in a new thread, @@ -38,9 +37,12 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; * * @author Lucas Ward * @author Mahmoud Ben Hassine + * @author Glenn Renfro * */ -@SpringJUnitConfig( + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml", "/job-runner-context.xml" }) class DatabaseShutdownFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java index 82fe410b3..c1314fa13 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java @@ -15,18 +15,21 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.sample.domain.person.PersonService; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig( +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/delegatingJob.xml", "/job-runner-context.xml" }) class DelegatingJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java index 17921faae..fa99efe54 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java @@ -15,20 +15,22 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; -@SpringJUnitConfig( +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/footballJob.xml", "/job-runner-context.xml" }) class FootballJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java index 30c09e31b..812d0e247 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java @@ -16,22 +16,18 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.Test; -import org.springframework.batch.core.BatchStatus; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.JobParametersBuilder; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.*; import org.springframework.batch.core.launch.JobOperator; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.*; /** * Functional test for graceful shutdown. A batch container is started in a new thread, @@ -39,9 +35,11 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; * * @author Lucas Ward * @author Parikshit Dutta + * @author Glenn Renfro * */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml", "/job-runner-context.xml" }) class GracefulShutdownFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GroovyJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GroovyJobFunctionalTests.java index 516eea438..1fce1ad33 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GroovyJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GroovyJobFunctionalTests.java @@ -16,23 +16,26 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.Job; +import org.springframework.batch.test.JobLauncherTestUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.io.File; import java.io.IOException; -import org.apache.commons.io.FileUtils; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.springframework.batch.core.Job; -import org.springframework.batch.test.JobLauncherTestUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; - -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/groovyJob.xml", "/job-runner-context.xml" }) -class GroovyJobFunctionalTests { +@ExtendWith(SpringExtension.class) +@ContextConfiguration( + locations = { "/simple-job-launcher-context.xml", "/jobs/groovyJob.xml", "/job-runner-context.xml" }) +public class GroovyJobFunctionalTests { @Autowired private JobLauncherTestUtils jobLauncherTestUtils; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HeaderFooterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HeaderFooterSampleFunctionalTests.java index dcd23da78..c1a452b5f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HeaderFooterSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HeaderFooterSampleFunctionalTests.java @@ -15,21 +15,24 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.io.BufferedReader; import java.io.FileReader; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.Resource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig( +import static org.springframework.test.util.AssertionErrors.assertTrue; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/headerFooterSample.xml", "/job-runner-context.xml" }) class HeaderFooterSampleFunctionalTests { @@ -60,12 +63,13 @@ class HeaderFooterSampleFunctionalTests { int lineCount = 0; while ((line = inputReader.readLine()) != null) { lineCount++; - assertTrue(outputReader.readLine().contains(line), "input line should correspond to output line"); + assertTrue("input line should correspond to output line", outputReader.readLine().contains(line)); } // footer contains the item count int itemCount = lineCount - 1; // minus 1 due to header line - assertTrue(outputReader.readLine().contains(String.valueOf(itemCount))); + assertTrue("OutputReader did not contain the values specified", + outputReader.readLine().contains(String.valueOf(itemCount))); inputReader.close(); outputReader.close(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index 22e600fc7..a2efc1545 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -15,19 +15,8 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; @@ -40,21 +29,35 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.core.RowMapper; import org.springframework.orm.hibernate5.HibernateJdbcException; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; +import javax.sql.DataSource; +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + /** * Test for HibernateJob - checks that customer credit has been updated to expected value. * * @author Dave Syer * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/hibernate-context.xml", "/jobs/hibernateJob.xml", - "/job-runner-context.xml" }) + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/hibernate-context.xml", + "/jobs/hibernateJob.xml", "/job-runner-context.xml" }) class HibernateFailureJobFunctionalTests { private static final BigDecimal CREDIT_INCREASE = CustomerCreditIncreaseProcessor.FIXED_AMOUNT; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java index a411c087b..3fe9c624a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java @@ -15,19 +15,12 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParametersBuilder; @@ -35,9 +28,17 @@ import org.springframework.batch.core.configuration.JobRegistry; import org.springframework.batch.core.configuration.support.ReferenceJobFactory; import org.springframework.batch.core.launch.JobOperator; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml" }) +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.*; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/infiniteLoopJob.xml" }) class JobOperatorFunctionalTests { private static final Log LOG = LogFactory.getLog(JobOperatorFunctionalTests.class); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java index 4d6e5ce24..b0767084b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java @@ -16,26 +16,31 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.converter.DefaultJobParametersConverter; import org.springframework.batch.support.PropertiesConverter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Sample using a step to launch a job. * * @author Dave Syer * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig + +@ExtendWith(SpringExtension.class) +@ContextConfiguration class JobStepFunctionalTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java index fa66a651d..7445594e3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java @@ -55,6 +55,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ class JsonSupportIntegrationTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/LoopFlowSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/LoopFlowSampleFunctionalTests.java index 3025970b9..c7e6d21c2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/LoopFlowSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/LoopFlowSampleFunctionalTests.java @@ -15,23 +15,27 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.sample.domain.trade.internal.ItemTrackingTradeItemWriter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Checks that expected number of items have been processed. * * @author Dan Garrette + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig( + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/loopFlowSample.xml", "/job-runner-context.xml" }) class LoopFlowSampleFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MailJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MailJobFunctionalTests.java index e23dda354..7d2be00c2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MailJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MailJobFunctionalTests.java @@ -15,16 +15,10 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Iterator; -import java.util.List; - -import javax.sql.DataSource; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -35,16 +29,26 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.mail.MailMessage; import org.springframework.mail.SimpleMailMessage; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; +import javax.sql.DataSource; +import java.util.Iterator; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author Dan Garrette * @author Dave Syer * @author Mahmoud Ben Hassine + * @author Glenn Renfro * @since 2.1 */ -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/mailJob.xml", "/job-runner-context.xml" }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration( + locations = { "/simple-job-launcher-context.xml", "/jobs/mailJob.xml", "/job-runner-context.xml" }) class MailJobFunctionalTests { private static final String email = "to@company.com"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java index 2bd416922..3d7d1c0d1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java @@ -18,18 +18,20 @@ package org.springframework.batch.sample; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.util.StringUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/multilineJob.xml", "/job-runner-context.xml" }) class MultilineJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java index 07aa65c61..8bb9fdd9b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java @@ -16,18 +16,20 @@ package org.springframework.batch.sample; -import static org.springframework.batch.test.AssertFile.assertFileEquals; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig( +import static org.springframework.batch.test.AssertFile.assertFileEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/multilineOrderJob.xml", "/job-runner-context.xml" }) class MultilineOrderJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java index ee898848b..9aaebab95 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java @@ -16,21 +16,24 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; -import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.jdbc.JdbcTestUtils; -@SpringJUnitConfig( +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/parallelJob.xml", "/job-runner-context.xml" }) class ParallelJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java index ea463ad9d..20675ed08 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java @@ -16,15 +16,8 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -39,9 +32,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig( +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/partitionFileJob.xml", "/job-runner-context.xml" }) class PartitionFileJobFunctionalTests implements ApplicationContextAware { @@ -84,7 +87,7 @@ class PartitionFileJobFunctionalTests implements ApplicationContextAware { assertEquals(inputs.size(), outputs.size()); int itemCount = inputs.size(); - assertTrue(itemCount > 0); + assertTrue(itemCount > 0, "No entries were available in the input"); inputs.iterator(); for (int i = 0; i < itemCount; i++) { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java index 424e7e9d2..739e80d9e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java @@ -16,15 +16,8 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -39,9 +32,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig( +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/partitionJdbcJob.xml", "/job-runner-context.xml" }) class PartitionJdbcJobFunctionalTests implements ApplicationContextAware { @@ -84,7 +87,7 @@ class PartitionJdbcJobFunctionalTests implements ApplicationContextAware { assertEquals(inputs.size(), outputs.size()); int itemCount = inputs.size(); - assertTrue(itemCount > 0); + assertTrue(itemCount > 0, "Input from reader has no entries."); inputs.iterator(); for (int i = 0; i < itemCount; i++) { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java index ef818bdcf..2c78478ce 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java @@ -21,7 +21,7 @@ import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -32,7 +32,8 @@ import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.PropertySource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,8 +43,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * writing. * * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig(classes = { JobRunnerConfiguration.class, ManagerConfiguration.class }) + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = { JobRunnerConfiguration.class, ManagerConfiguration.class }) @PropertySource("classpath:remote-chunking.properties") class RemoteChunkingJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java index 8beedffa9..fc23b8e06 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java @@ -15,15 +15,13 @@ */ package org.springframework.batch.sample; -import javax.sql.DataSource; - import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -34,6 +32,9 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.PropertySource; import org.springframework.core.io.ClassPathResource; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import javax.sql.DataSource; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,7 +42,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Base class for remote partitioning tests. * * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ + +@ExtendWith(SpringExtension.class) @PropertySource("classpath:remote-partitioning.properties") public abstract class RemotePartitioningJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFileSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFileSampleFunctionalTests.java index 3e0171770..4bf488d13 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFileSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFileSampleFunctionalTests.java @@ -16,11 +16,8 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -32,14 +29,19 @@ import org.springframework.batch.test.AssertFile; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Dan Garrette * @author Mahmoud Ben Hassine + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/restartFileSampleJob.xml", "/job-runner-context.xml" }) class RestartFileSampleFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java index 920f36995..8d4fdd055 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java @@ -16,12 +16,8 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -30,18 +26,26 @@ import org.springframework.batch.support.PropertiesConverter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.test.jdbc.JdbcTestUtils; +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Simple restart scenario. * * @author Robert Kasanicky * @author Dave Syer * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/restartSample.xml", "/job-runner-context.xml" }) class RestartFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleConfigurationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleConfigurationTests.java index c5b36623b..92952fa59 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleConfigurationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleConfigurationTests.java @@ -15,10 +15,8 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.sample.config.DataSourceConfiguration; import org.springframework.batch.sample.config.JobRunnerConfiguration; @@ -27,7 +25,10 @@ import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeIte import org.springframework.batch.sample.support.RetrySampleItemWriter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Checks that expected number of items have been processed. @@ -35,8 +36,10 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; * @author Robert Kasanicky * @author Dave Syer * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( classes = { DataSourceConfiguration.class, RetrySampleConfiguration.class, JobRunnerConfiguration.class }) class RetrySampleConfigurationTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java index a25571b5d..94555bb41 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java @@ -15,24 +15,28 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader; import org.springframework.batch.sample.support.RetrySampleItemWriter; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Checks that expected number of items have been processed. * * @author Robert Kasanicky * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig( + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/retrySample.xml", "/job-runner-context.xml" }) class RetrySampleFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java index 89407584c..c06f8901e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java @@ -15,26 +15,10 @@ */ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.math.BigDecimal; -import java.util.Map; - -import javax.sql.DataSource; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.batch.core.BatchStatus; -import org.springframework.batch.core.ExitStatus; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.JobParametersInvalidException; -import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.UnexpectedJobExecutionException; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.*; import org.springframework.batch.core.explore.JobExplorer; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.launch.JobOperator; @@ -48,14 +32,21 @@ import org.springframework.batch.sample.domain.trade.internal.TradeWriter; import org.springframework.batch.sample.skip.SkippableExceptionDuringProcessSample; import org.springframework.batch.sample.skip.SkippableExceptionDuringReadSample; import org.springframework.batch.sample.skip.SkippableExceptionDuringWriteSample; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.jdbc.JdbcTestUtils; + +import javax.sql.DataSource; +import java.math.BigDecimal; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; /** * Error is encountered during writing - transaction is rolled back and the error item is @@ -65,7 +56,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; * @author Dan Garrette * @author Mahmoud Ben Hassine */ -@SpringJUnitConfig(locations = { "/skipSample-job-launcher-context.xml" }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/skipSample-job-launcher-context.xml" }) class SkipSampleFunctionalTests { private JdbcTemplate jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java index 78d60c102..6c0c192ba 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java @@ -16,9 +16,8 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -26,9 +25,13 @@ import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.scope.context.ChunkContext; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig( +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/taskletJob.xml", "/job-runner-context.xml" }) class TaskletJobFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java index b146c8fb0..2c096a35f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java @@ -16,9 +16,21 @@ package org.springframework.batch.sample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.Job; +import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.test.JobLauncherTestUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.jdbc.JdbcTestUtils; +import javax.sql.DataSource; import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; @@ -27,22 +39,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.sql.DataSource; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import org.springframework.batch.core.Job; -import org.springframework.batch.sample.domain.trade.Trade; -import org.springframework.batch.test.JobLauncherTestUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import org.springframework.test.jdbc.JdbcTestUtils; - -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/tradeJob.xml", "/job-runner-context.xml" }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration( + locations = { "/simple-job-launcher-context.xml", "/jobs/tradeJob.xml", "/job-runner-context.xml" }) class TradeJobFunctionalTests { private static final String GET_TRADES = "select ISIN, QUANTITY, PRICE, CUSTOMER, ID, VERSION from TRADE order by ISIN"; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java index 9bbf34a56..8853641f1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ColumnRangePartitionerTests.java @@ -15,24 +15,31 @@ */ package org.springframework.batch.sample.common; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.Map; import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.item.ExecutionContext; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration class ColumnRangePartitionerTests { - @Autowired private DataSource dataSource; - private final ColumnRangePartitioner partitioner = new ColumnRangePartitioner(); + @Autowired + public void setDataSource(DataSource dataSource) { + this.dataSource = dataSource; + } + + private ColumnRangePartitioner partitioner = new ColumnRangePartitioner(); @Test void testPartition() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java index 8d9e431b6..302c1f8db 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java @@ -15,12 +15,6 @@ */ package org.springframework.batch.sample.common; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - -import java.util.ArrayList; -import java.util.List; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.ExecutionContext; @@ -29,12 +23,19 @@ import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemStreamException; import org.springframework.lang.Nullable; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + /** * Unit test class that was used as part of the Reference Documentation. I'm only * including it in the code to help keep the reference documentation up to date as the * code base shifts. * * @author Lucas Ward + * @author Glenn Renfro * */ class CustomItemReaderTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java index 378517fe8..f2d9e8324 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemWriterTests.java @@ -15,18 +15,15 @@ */ package org.springframework.batch.sample.common; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.junit.jupiter.api.Test; - import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Unit test class that was used as part of the Reference Documentation. I'm only * including it in the code to help keep the reference documentation up to date as the @@ -34,7 +31,8 @@ import org.springframework.batch.support.transaction.TransactionAwareProxyFactor * * @author Lucas Ward * @author Mahmoud Ben Hassine - * + * @author Glenn Renfro + * */ class CustomItemWriterTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java index 1d9268979..3c94bcbf3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ExceptionThrowingItemReaderProxyTests.java @@ -15,11 +15,6 @@ */ package org.springframework.batch.sample.common; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.batch.core.UnexpectedJobExecutionException; @@ -28,6 +23,11 @@ import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.batch.sample.support.ExceptionThrowingItemReaderProxy; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + class ExceptionThrowingItemReaderProxyTests { // expected call count before exception is thrown (exception should be thrown in next diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java index 75fd4934a..201006d21 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/OutputFileListenerTests.java @@ -16,6 +16,7 @@ package org.springframework.batch.sample.common; import org.junit.jupiter.api.Test; + import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.StepExecution; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java index ae78916f7..de3b3a014 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemReaderTests.java @@ -15,14 +15,8 @@ */ package org.springframework.batch.sample.common; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; - -import java.util.Arrays; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobParameters; @@ -30,7 +24,8 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.Chunk; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.transaction.AfterTransaction; import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.test.jdbc.JdbcTestUtils; @@ -41,7 +36,13 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionCallback; import org.springframework.transaction.support.TransactionTemplate; -@SpringJUnitConfig +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration() class StagingItemReaderTests { private JdbcTemplate jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java index a4fe5f3f0..cf5fa082d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/StagingItemWriterTests.java @@ -15,14 +15,9 @@ */ package org.springframework.batch.sample.common; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Collections; - -import javax.sql.DataSource; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobParameters; @@ -30,11 +25,17 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.Chunk; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; -@SpringJUnitConfig +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration class StagingItemWriterTests { private JdbcTemplate jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java index ed0c68e92..5c6515ba6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDaoIntegrationTests.java @@ -15,32 +15,34 @@ */ package org.springframework.batch.sample.domain.football.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collections; - -import javax.sql.DataSource; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.item.Chunk; import org.springframework.batch.sample.domain.football.Game; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; +import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author Lucas Ward * @author Mahmoud Ben Hassine + * @author Glenn Renfro * */ -@SpringJUnitConfig(locations = { "/data-source-context.xml" }) + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/data-source-context.xml" }) class JdbcGameDaoIntegrationTests { private JdbcGameDao gameDao; @@ -58,7 +60,7 @@ class JdbcGameDaoIntegrationTests { } @BeforeEach - void onSetUpBeforeTransaction() { + void onSetUpBeforeTransaction() throws Exception { game.setId("XXXXX00"); game.setYear(1996); game.setTeam("mia"); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java index 16757ddd6..8542802a5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerDaoIntegrationTests.java @@ -15,29 +15,32 @@ */ package org.springframework.batch.sample.domain.football.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.sql.ResultSet; -import java.sql.SQLException; - -import javax.sql.DataSource; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.sample.domain.football.Player; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; +import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author Lucas Ward * @author Mahmoud Ben Hassine + * @author Glenn Renfro * */ -@SpringJUnitConfig(locations = { "/data-source-context.xml" }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/data-source-context.xml" }) class JdbcPlayerDaoIntegrationTests { private JdbcPlayerDao playerDao; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java index d674cc843..1eac265ba 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDaoIntegrationTests.java @@ -15,29 +15,30 @@ */ package org.springframework.batch.sample.domain.football.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Collections; - -import javax.sql.DataSource; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.item.Chunk; import org.springframework.batch.sample.domain.football.PlayerSummary; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; import org.springframework.transaction.annotation.Transactional; +import javax.sql.DataSource; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author Lucas Ward * @author Mahmoud Ben Hassine + * @author Glenn Renfro * */ -@SpringJUnitConfig(locations = { "/data-source-context.xml" }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/data-source-context.xml" }) class JdbcPlayerSummaryDaoIntegrationTests { private JdbcPlayerSummaryDao playerSummaryDao; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java index cf23c6457..e06732b94 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemFieldSetMapperTests.java @@ -15,16 +15,13 @@ */ package org.springframework.batch.sample.domain.multiline; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.Test; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; +import static org.junit.jupiter.api.Assertions.*; + class AggregateItemFieldSetMapperTests { private final AggregateItemFieldSetMapper mapper = new AggregateItemFieldSetMapper<>(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java index 592ffbd42..fbf2620b8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemReaderTests.java @@ -15,21 +15,25 @@ */ package org.springframework.batch.sample.domain.multiline; -import static org.junit.jupiter.api.Assertions.*; -import java.util.Collection; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.ItemReader; import org.springframework.lang.Nullable; +import java.util.Collection; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + class AggregateItemReaderTests { + private ItemReader> input; + private AggregateItemReader provider; @BeforeEach void setUp() { - ItemReader> input = new ItemReader<>() { + input = new ItemReader>() { private int count = 0; @Nullable diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java index be2afcbe9..1f1e9983a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/multiline/AggregateItemTests.java @@ -15,14 +15,13 @@ */ package org.springframework.batch.sample.domain.multiline; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + /** * @author Dave Syer + * @author Glenn Renfro * */ class AggregateItemTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java index 659d19a26..01a6e16b3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/OrderItemReaderTests.java @@ -15,13 +15,6 @@ */ package org.springframework.batch.sample.domain.order; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.ItemReader; @@ -30,6 +23,10 @@ import org.springframework.batch.item.file.transform.DefaultFieldSet; import org.springframework.batch.item.file.transform.FieldSet; import org.springframework.batch.sample.domain.order.internal.OrderItemReader; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + class OrderItemReaderTests { private OrderItemReader provider; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java index f3bf3cc2a..f3994455b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidatorTests.java @@ -15,27 +15,28 @@ */ package org.springframework.batch.sample.domain.order.internal.validator; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.batch.sample.domain.order.*; +import org.springframework.validation.BeanPropertyBindingResult; +import org.springframework.validation.Errors; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.order.Address; -import org.springframework.batch.sample.domain.order.BillingInfo; -import org.springframework.batch.sample.domain.order.Customer; -import org.springframework.batch.sample.domain.order.LineItem; -import org.springframework.batch.sample.domain.order.Order; -import org.springframework.batch.sample.domain.order.ShippingInfo; -import org.springframework.validation.BeanPropertyBindingResult; -import org.springframework.validation.Errors; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; class OrderValidatorTests { - private final OrderValidator orderValidator = new OrderValidator(); + private OrderValidator orderValidator; + + @BeforeEach + void setUp() throws Exception { + orderValidator = new OrderValidator(); + } @Test void testSupports() { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java index c106cbca4..3a5d3670a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CompositeCustomerUpdateLineTokenizerTests.java @@ -15,9 +15,6 @@ */ package org.springframework.batch.sample.domain.trade; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.batch.item.file.transform.DefaultFieldSet; @@ -25,8 +22,12 @@ import org.springframework.batch.item.file.transform.FieldSet; import org.springframework.batch.item.file.transform.LineTokenizer; import org.springframework.lang.Nullable; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + /** * @author Lucas Ward + * @author Glenn Renfro * */ class CompositeCustomerUpdateLineTokenizerTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java index 800356b35..727fe9acb 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/CustomerUpdateProcessorTests.java @@ -15,21 +15,20 @@ */ package org.springframework.batch.sample.domain.trade; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.math.BigDecimal; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.springframework.batch.sample.domain.trade.CustomerOperation.ADD; -import static org.springframework.batch.sample.domain.trade.CustomerOperation.DELETE; -import static org.springframework.batch.sample.domain.trade.CustomerOperation.UPDATE; - -import java.math.BigDecimal; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.springframework.batch.sample.domain.trade.CustomerOperation.*; /** * @author Lucas Ward + * @author Glenn Renfro * */ class CustomerUpdateProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java index c78cb0770..d4931e2be 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/TradeTests.java @@ -15,10 +15,10 @@ */ package org.springframework.batch.sample.domain.trade; -import java.math.BigDecimal; - import org.junit.jupiter.api.Test; +import java.math.BigDecimal; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java index ecc03ae49..aa102549b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditIncreaseProcessorTests.java @@ -15,17 +15,18 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import org.springframework.batch.sample.domain.trade.CustomerCredit; import java.math.BigDecimal; -import org.junit.jupiter.api.Test; -import org.springframework.batch.sample.domain.trade.CustomerCredit; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests for {@link CustomerCreditIncreaseProcessor}. * * @author Robert Kasanicky + * @author Glenn Renfro */ class CustomerCreditIncreaseProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java index a8193517b..07b9db5f9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetterTests.java @@ -27,6 +27,7 @@ import org.springframework.batch.sample.domain.trade.CustomerCredit; /** * @author Dave Syer + * @author Glenn Renfro * */ class CustomerCreditUpdatePreparedStatementSetterTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java index 824d5c7cb..fab13fba9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerCreditUpdateProcessorTests.java @@ -15,18 +15,16 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.mockito.Mockito.mock; - -import java.math.BigDecimal; -import java.util.Collections; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import org.springframework.batch.item.Chunk; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import java.math.BigDecimal; + +import static org.mockito.Mockito.mock; + class CustomerCreditUpdateProcessorTests { private CustomerCreditDao dao; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java index 7c13a6368..4abf86a8a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/CustomerUpdateProcessorTests.java @@ -15,18 +15,16 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.math.BigDecimal; -import java.util.Collections; - import org.junit.jupiter.api.Test; - import org.springframework.batch.item.Chunk; import org.springframework.batch.sample.domain.trade.CustomerDebit; import org.springframework.batch.sample.domain.trade.CustomerDebitDao; import org.springframework.batch.sample.domain.trade.Trade; +import java.math.BigDecimal; + +import static org.junit.jupiter.api.Assertions.assertEquals; + class CustomerUpdateProcessorTests { @Test diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java index e63616766..e442ea414 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java @@ -15,20 +15,18 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.mockito.Mockito.mock; - -import java.math.BigDecimal; -import java.util.Collections; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import org.springframework.batch.item.Chunk; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.sample.domain.trade.CustomerCredit; +import java.math.BigDecimal; + +import static org.mockito.Mockito.mock; + class FlatFileCustomerCreditDaoTests { private ResourceLifecycleItemWriter output; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java index fec0f83b7..9ed36bbcf 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/GeneratingItemReaderTests.java @@ -20,12 +20,17 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Tests for {@link GeneratingTradeItemReader}. * * @author Robert Kasanicky + * @author Glenn Renfro */ -public class GeneratingItemReaderTests { +class GeneratingItemReaderTests { private final GeneratingTradeItemReader reader = new GeneratingTradeItemReader(); @@ -33,7 +38,7 @@ public class GeneratingItemReaderTests { * Generates a given number of not-null records, consecutive calls return null. */ @Test - public void testRead() throws Exception { + void testRead() throws Exception { int counter = 0; int limit = 10; reader.setLimit(limit); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java index 49b796223..766fe934d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests.java @@ -15,24 +15,26 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.sample.domain.trade.CustomerDebit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; -@SpringJUnitConfig +import javax.sql.DataSource; +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration() class JdbcCustomerDebitDaoTests { private JdbcOperations jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java index c03736cc8..08bd2a7e7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/JdbcTradeWriterTests.java @@ -15,15 +15,8 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.math.BigDecimal; -import java.sql.ResultSet; -import java.sql.SQLException; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.sample.domain.trade.Trade; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; @@ -32,10 +25,19 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; -@SpringJUnitConfig(locations = { "/data-source-context.xml" }) +import javax.sql.DataSource; +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/data-source-context.xml" }) class JdbcTradeWriterTests implements InitializingBean { private JdbcOperations jdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java index b167b2d95..4a130314d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeProcessorTests.java @@ -15,17 +15,14 @@ */ package org.springframework.batch.sample.domain.trade.internal; -import static org.mockito.Mockito.mock; - -import java.util.Collections; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import org.springframework.batch.item.Chunk; import org.springframework.batch.sample.domain.trade.Trade; import org.springframework.batch.sample.domain.trade.TradeDao; +import static org.mockito.Mockito.mock; + class TradeProcessorTests { private TradeDao writer; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java index 8b77be2f3..7db9dd03e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/AbstractIoSampleTests.java @@ -37,6 +37,7 @@ import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.batch.test.MetaDataInstanceFactory; import org.springframework.batch.test.StepScopeTestExecutionListener; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; @@ -49,7 +50,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution * @author Robert Kasanicky * @author Mahmoud Ben Hassine */ -@SpringJUnitConfig( +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/job-runner-context.xml", "/jobs/ioSampleJob.xml" }) @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, StepScopeTestExecutionListener.class }) abstract class AbstractIoSampleTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java index 96d2be099..65a7ae687 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java @@ -16,6 +16,8 @@ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.scope.context.StepSynchronizationManager; @@ -23,13 +25,17 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.test.MetaDataInstanceFactory; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette * @author Dave Syer + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = "/jobs/iosample/delimited.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/delimited.xml") class DelimitedFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java index d2280387d..6d1df42fe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java @@ -16,15 +16,18 @@ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.scope.context.StepSynchronizationManager; import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.test.MetaDataInstanceFactory; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig(locations = "/jobs/iosample/fixedLength.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/fixedLength.xml") class FixedLengthFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/HibernateFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/HibernateFunctionalTests.java index 45f8047d7..72e7709e3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/HibernateFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/HibernateFunctionalTests.java @@ -15,11 +15,15 @@ */ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig(locations = { "/hibernate-context.xml", "/jobs/iosample/hibernate.xml" }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/hibernate-context.xml", "/jobs/iosample/hibernate.xml" }) class HibernateFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java index e39e75898..be1928d07 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcCursorFunctionalTests.java @@ -16,15 +16,19 @@ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = "/jobs/iosample/jdbcCursor.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/jdbcCursor.xml") class JdbcCursorFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcPagingFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcPagingFunctionalTests.java index a6b85ea1e..a96e2440e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcPagingFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JdbcPagingFunctionalTests.java @@ -16,20 +16,23 @@ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.scope.context.StepSynchronizationManager; import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.test.MetaDataInstanceFactory; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette * @author Dave Syer * @since 2.0 */ -@SpringJUnitConfig(locations = "/jobs/iosample/jdbcPaging.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/jdbcPaging.xml") class JdbcPagingFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JpaFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JpaFunctionalTests.java index 053349dec..b6b75de89 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JpaFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/JpaFunctionalTests.java @@ -15,11 +15,15 @@ */ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig(locations = "/jobs/iosample/jpa.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/jpa.xml") class JpaFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java index 959578742..0f6ad2694 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java @@ -17,20 +17,23 @@ package org.springframework.batch.sample.iosample; import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.Job; import org.springframework.batch.test.AssertFile; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette * @author Mahmoud Ben Hassine + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/iosample/multiLine.xml", "/job-runner-context.xml" }) class MultiLineFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java index 86f4d5aaf..340f2a2cb 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java @@ -17,20 +17,24 @@ package org.springframework.batch.sample.iosample; import org.junit.jupiter.api.Test; - import org.springframework.batch.core.Job; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.test.AssertFile; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.FileSystemResource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette * @author Mahmoud Ben Hassine + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = { "/simple-job-launcher-context.xml", "/jobs/iosample/multiRecordType.xml", +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = { "/simple-job-launcher-context.xml", "/jobs/iosample/multiRecordType.xml", "/job-runner-context.xml" }) class MultiRecordTypeFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java index 7a962d88e..d1d372e1e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java @@ -16,6 +16,7 @@ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.StepExecution; @@ -23,13 +24,16 @@ import org.springframework.batch.core.scope.context.StepSynchronizationManager; import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.test.MetaDataInstanceFactory; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = "/jobs/iosample/multiResource.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/multiResource.xml") class MultiResourceFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/RepositoryFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/RepositoryFunctionalTests.java index 63bc43d2f..2fdab8d63 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/RepositoryFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/RepositoryFunctionalTests.java @@ -15,15 +15,19 @@ */ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.scope.context.StepSynchronizationManager; import org.springframework.batch.item.ItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.batch.test.MetaDataInstanceFactory; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@SpringJUnitConfig(locations = "/jobs/iosample/repository.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/repository.xml") class RepositoryFunctionalTests extends AbstractIoSampleTests { @Override diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java index bfecd2c11..0dd99bdfe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java @@ -22,6 +22,8 @@ import java.util.Date; import java.util.concurrent.Callable; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -38,12 +40,18 @@ import org.springframework.batch.test.StepScopeTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Dave Syer + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", "/jobs/iosample/delimited.xml" }) class TwoJobInstancesDelimitedFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java index 4ec51bf10..3ca4e1a26 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java @@ -16,31 +16,30 @@ package org.springframework.batch.sample.iosample; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; - -import java.util.Date; - -import javax.sql.DataSource; - import org.junit.jupiter.api.Test; -import org.springframework.batch.core.BatchStatus; -import org.springframework.batch.core.Job; -import org.springframework.batch.core.JobExecution; -import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.JobParametersBuilder; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.batch.core.*; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.jdbc.JdbcTestUtils; +import javax.sql.DataSource; +import java.util.Date; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; + /** * @author Dave Syer * @author Mahmoud Ben Hassine + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig( +@ExtendWith(SpringExtension.class) +@ContextConfiguration( locations = { "/simple-job-launcher-context.xml", "/jobs/ioSampleJob.xml", "/jobs/iosample/jdbcPaging.xml" }) class TwoJobInstancesPagingFunctionalTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java index 75432923b..b2a55f525 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/XmlFunctionalTests.java @@ -16,18 +16,23 @@ package org.springframework.batch.sample.iosample; +import org.junit.jupiter.api.extension.ExtendWith; + import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.xml.StaxEventItemReader; import org.springframework.batch.sample.domain.trade.CustomerCredit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Dan Garrette + * @author Glenn Renfro * @since 2.0 */ -@SpringJUnitConfig(locations = "/jobs/iosample/xml.xml") +@ExtendWith(SpringExtension.class) +@ContextConfiguration(locations = "/jobs/iosample/xml.xml") class XmlFunctionalTests extends AbstractIoSampleTests { @Autowired diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java index 9781f3ba1..fd82351dc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/jmx/JobExecutionNotificationPublisherTests.java @@ -15,21 +15,21 @@ */ package org.springframework.batch.sample.jmx; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.List; - -import javax.management.Notification; - import org.junit.jupiter.api.Test; import org.springframework.jmx.export.notification.NotificationPublisher; import org.springframework.jmx.export.notification.UnableToSendNotificationException; +import javax.management.Notification; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * @author Dave Syer * @author Thomas Risberg + * @author Glenn Renfro * */ class JobExecutionNotificationPublisherTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java index 42716d285..4bd7c18e1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/launch/RemoteLauncherTests.java @@ -15,18 +15,6 @@ */ package org.springframework.batch.sample.launch; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.management.MalformedObjectNameException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.AfterAll; @@ -39,6 +27,13 @@ import org.springframework.jmx.access.InvalidInvocationException; import org.springframework.jmx.access.MBeanProxyFactoryBean; import org.springframework.jmx.support.MBeanServerConnectionFactoryBean; +import javax.management.MalformedObjectNameException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + /** * @author Dave Syer * diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java index fdba326d3..ea7a6704c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/quartz/JobLauncherDetailsTests.java @@ -15,14 +15,6 @@ */ package org.springframework.batch.sample.quartz; -import static org.mockito.Mockito.mock; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.quartz.Job; @@ -44,9 +36,18 @@ import org.springframework.batch.core.repository.JobExecutionAlreadyRunningExcep import org.springframework.batch.core.repository.JobRestartException; import org.springframework.lang.Nullable; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; + /** * @author Dave Syer - * + * @author Glenn Renfro + * */ class JobLauncherDetailsTests { @@ -57,7 +58,7 @@ class JobLauncherDetailsTests { private final List list = new ArrayList<>(); @BeforeEach - void setUp() { + public void setUp() throws Exception { details.setJobLauncher(new JobLauncher() { @Override public JobExecution run(org.springframework.batch.core.Job job, JobParameters jobParameters) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java index 661f8d129..f4ba455b5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractFieldSetMapperTests.java @@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; * Encapsulates basic logic for testing custom {@link FieldSetMapper} implementations. * * @author Robert Kasanicky + * @author Glenn Renfro */ public abstract class AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java index 3f74c5034..9b36b2fa3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/AbstractRowMapperTests.java @@ -15,6 +15,7 @@ */ package org.springframework.batch.sample.support; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,12 +23,14 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.junit.jupiter.api.Test; + import org.springframework.jdbc.core.RowMapper; /** * Encapsulates logic for testing custom {@link RowMapper} implementations. * * @author Robert Kasanicky + * @author Glenn Renfro * @param the item type */ public abstract class AbstractRowMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java index 23f223dbc..198cedacb 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/ItemTrackingItemWriterTests.java @@ -15,22 +15,21 @@ */ package org.springframework.batch.sample.support; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import java.io.IOException; -import java.util.Arrays; - import org.junit.jupiter.api.Test; - import org.springframework.batch.item.Chunk; import org.springframework.batch.sample.domain.trade.Trade; import org.springframework.batch.sample.domain.trade.internal.ItemTrackingTradeItemWriter; +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + /** * @author Dave Syer * @author Mahmoud Ben Hassine - * + * @author Glenn Renfro + * */ class ItemTrackingItemWriterTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java index d3ea9e62c..76e723c18 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/support/RetrySampleItemWriterTests.java @@ -15,16 +15,12 @@ */ package org.springframework.batch.sample.support; +import org.junit.jupiter.api.Test; +import org.springframework.batch.item.Chunk; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import java.util.Arrays; -import java.util.Collections; - -import org.junit.jupiter.api.Test; - -import org.springframework.batch.item.Chunk; - /** * Tests for {@link RetrySampleItemWriter}. * diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java index 94acad2c9..39d550b37 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/ValidationSampleFunctionalTests.java @@ -16,10 +16,8 @@ package org.springframework.batch.sample.validation; -import java.util.List; - import org.junit.jupiter.api.Test; - +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -28,14 +26,19 @@ import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.item.support.ListItemWriter; import org.springframework.batch.sample.validation.domain.Person; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Mahmoud Ben Hassine + * @author Glenn Renfro */ -@SpringJUnitConfig(classes = { ValidationSampleConfiguration.class }) +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = { ValidationSampleConfiguration.class }) class ValidationSampleFunctionalTests { @Autowired diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java b/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java index 3197ca49d..f8fc2a832 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 the original author or authors. + * Copyright 2006-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,18 @@ package org.springframework.batch.test; -import static org.junit.Assert.assertEquals; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import org.springframework.core.io.Resource; +import org.springframework.util.Assert; /** * This class can be used to assert that two files are the same. * * @author Dan Garrette + * @author Glenn Renfro * @since 2.0 */ public abstract class AssertFile { @@ -39,12 +39,13 @@ public abstract class AssertFile { int lineNum = 1; for (String expectedLine = null; (expectedLine = expectedReader.readLine()) != null; lineNum++) { String actualLine = actualReader.readLine(); - assertEquals("Line number " + lineNum + " does not match.", expectedLine, actualLine); + Assert.state(assertStringEqual(expectedLine, actualLine), + "Line number " + lineNum + " does not match."); } String actualLine = actualReader.readLine(); - assertEquals("More lines than expected. There should not be a line number " + lineNum + ".", null, - actualLine); + Assert.state(assertStringEqual(null, actualLine), + "More lines than expected. There should not be a line number " + lineNum + "."); } finally { expectedReader.close(); @@ -63,7 +64,8 @@ public abstract class AssertFile { while (expectedReader.readLine() != null) { lineCount++; } - assertEquals(expectedLineCount, lineCount); + Assert.state(expectedLineCount == lineCount, String + .format("Line count of %d does not match expected count of %d", lineCount, expectedLineCount)); } finally { expectedReader.close(); @@ -74,4 +76,13 @@ public abstract class AssertFile { assertLineCount(expectedLineCount, resource.getFile()); } + private static boolean assertStringEqual(String expected, String actual) { + if (expected == null) { + return actual == null; + } + else { + return expected.equals(actual); + } + } + } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/AssertFileTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/AssertFileTests.java index 74af95840..a42a560dc 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/AssertFileTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/AssertFileTests.java @@ -15,18 +15,17 @@ */ package org.springframework.batch.test; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.ComparisonFailure; import org.junit.jupiter.api.Test; import org.springframework.core.io.FileSystemResource; +import static org.junit.jupiter.api.Assertions.*; + /** * This class can be used to assert that two files are the same. * * @author Dan Garrette + * @author Glenn Renfro * @since 2.0 */ class AssertFileTests { @@ -39,21 +38,36 @@ class AssertFileTests { } @Test - void testAssertEquals_notEqual() { - Error error = assertThrows(ComparisonFailure.class, () -> executeAssertEquals("input1.txt", "input2.txt")); - assertTrue(error.getMessage().startsWith("Line number 3 does not match.")); + public void testAssertEquals_notEqual() throws Exception { + try { + executeAssertEquals("input1.txt", "input2.txt"); + fail(); + } + catch (IllegalStateException e) { + assertTrue(e.getMessage().startsWith("Line number 3 does not match.")); + } } @Test - void testAssertEquals_tooLong() { - Error error = assertThrows(AssertionError.class, () -> executeAssertEquals("input3.txt", "input1.txt")); - assertTrue(error.getMessage().startsWith("More lines than expected. There should not be a line number 4.")); + public void testAssertEquals_tooLong() throws Exception { + try { + executeAssertEquals("input3.txt", "input1.txt"); + fail(); + } + catch (IllegalStateException e) { + assertTrue(e.getMessage().startsWith("More lines than expected. There should not be a line number 4.")); + } } @Test - void testAssertEquals_tooShort() { - Error error = assertThrows(AssertionError.class, () -> executeAssertEquals("input1.txt", "input3.txt")); - assertTrue(error.getMessage().startsWith("Line number 4 does not match.")); + public void testAssertEquals_tooShort() throws Exception { + try { + executeAssertEquals("input1.txt", "input3.txt"); + fail(); + } + catch (IllegalStateException e) { + assertTrue(e.getMessage().startsWith("Line number 4 does not match.")); + } } @Test @@ -62,15 +76,25 @@ class AssertFileTests { } @Test - void testAssertEquals_blank_tooLong() { - Error error = assertThrows(AssertionError.class, () -> executeAssertEquals("blank.txt", "input1.txt")); - assertTrue(error.getMessage().startsWith("More lines than expected. There should not be a line number 1.")); + public void testAssertEquals_blank_tooLong() throws Exception { + try { + executeAssertEquals("blank.txt", "input1.txt"); + fail(); + } + catch (IllegalStateException e) { + assertTrue(e.getMessage().startsWith("More lines than expected. There should not be a line number 1.")); + } } @Test - void testAssertEquals_blank_tooShort() { - Error error = assertThrows(AssertionError.class, () -> executeAssertEquals("input1.txt", "blank.txt")); - assertTrue(error.getMessage().startsWith("Line number 1 does not match.")); + public void testAssertEquals_blank_tooShort() throws Exception { + try { + executeAssertEquals("input1.txt", "blank.txt"); + fail(); + } + catch (IllegalStateException e) { + assertTrue(e.getMessage().startsWith("Line number 1 does not match.")); + } } private void executeAssertEquals(String expected, String actual) throws Exception {