Skip to content

Commit 4d0ed63

Browse files
committed
Deprecate AssertFile
Resolves #4181
1 parent 7e535af commit 4d0ed63

File tree

5 files changed

+34
-10
lines changed

5 files changed

+34
-10
lines changed

spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
package org.springframework.batch.sample;
1818

19+
import java.nio.file.Files;
20+
import java.nio.file.Path;
21+
22+
import org.junit.jupiter.api.Assertions;
1923
import org.junit.jupiter.api.Test;
2024

2125
import org.springframework.batch.core.Job;
@@ -25,8 +29,6 @@
2529
import org.springframework.core.io.FileSystemResource;
2630
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
2731

28-
import static org.springframework.batch.test.AssertFile.assertFileEquals;
29-
3032
@SpringJUnitConfig(
3133
locations = { "/simple-job-launcher-context.xml", "/jobs/multilineOrderJob.xml", "/job-runner-context.xml" })
3234
class MultilineOrderJobFunctionalTests {
@@ -42,7 +44,9 @@ class MultilineOrderJobFunctionalTests {
4244
void testJobLaunch(@Autowired Job job) throws Exception {
4345
this.jobLauncherTestUtils.setJob(job);
4446
this.jobLauncherTestUtils.launchJob();
45-
assertFileEquals(new ClassPathResource(EXPECTED), new FileSystemResource(ACTUAL));
47+
Path expectedFile = new ClassPathResource(EXPECTED).getFile().toPath();
48+
Path actualFile = new FileSystemResource(ACTUAL).getFile().toPath();
49+
Assertions.assertLinesMatch(Files.lines(expectedFile), Files.lines(actualFile));
4650
}
4751

4852
}

spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFileSampleFunctionalTests.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
package org.springframework.batch.sample;
1818

19+
import java.io.File;
20+
import java.nio.file.Files;
21+
import java.nio.file.Path;
22+
23+
import org.junit.jupiter.api.Assertions;
1924
import org.junit.jupiter.api.Test;
2025

2126
import org.springframework.batch.core.BatchStatus;
@@ -25,7 +30,6 @@
2530
import org.springframework.batch.item.Chunk;
2631
import org.springframework.batch.item.file.FlatFileItemWriter;
2732
import org.springframework.batch.sample.domain.trade.CustomerCredit;
28-
import org.springframework.batch.test.AssertFile;
2933
import org.springframework.batch.test.JobLauncherTestUtils;
3034
import org.springframework.beans.factory.annotation.Autowired;
3135
import org.springframework.core.io.Resource;
@@ -56,11 +60,13 @@ void runTest(@Autowired Job job) throws Exception {
5660

5761
JobExecution je1 = jobLauncherTestUtils.launchJob(jobParameters);
5862
assertEquals(BatchStatus.FAILED, je1.getStatus());
59-
AssertFile.assertLineCount(10, outputResource);
63+
Path outputResourceFile = outputResource.getFile().toPath();
64+
Assertions.assertEquals(10, Files.lines(outputResourceFile).count());
6065

6166
JobExecution je2 = jobLauncherTestUtils.launchJob(jobParameters);
6267
assertEquals(BatchStatus.COMPLETED, je2.getStatus());
63-
AssertFile.assertLineCount(20, outputResource);
68+
outputResourceFile = outputResource.getFile().toPath();
69+
Assertions.assertEquals(20, Files.lines(outputResourceFile).count());
6470
}
6571

6672
static class CustomerCreditFlatFileItemWriter extends FlatFileItemWriter<CustomerCredit> {

spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiLineFunctionalTests.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616

1717
package org.springframework.batch.sample.iosample;
1818

19+
import java.nio.file.Files;
20+
import java.nio.file.Path;
21+
22+
import org.junit.jupiter.api.Assertions;
1923
import org.junit.jupiter.api.Test;
2024

2125
import org.springframework.batch.core.Job;
22-
import org.springframework.batch.test.AssertFile;
2326
import org.springframework.batch.test.JobLauncherTestUtils;
2427
import org.springframework.beans.factory.annotation.Autowired;
2528
import org.springframework.core.io.FileSystemResource;
@@ -54,7 +57,9 @@ void testJob(@Autowired Job job) throws Exception {
5457
this.jobLauncherTestUtils.launchJob();
5558

5659
// then
57-
AssertFile.assertFileEquals(new FileSystemResource(INPUT_FILE), new FileSystemResource(OUTPUT_FILE));
60+
Path inputFile = new FileSystemResource(INPUT_FILE).getFile().toPath();
61+
Path outputFile = new FileSystemResource(OUTPUT_FILE).getFile().toPath();
62+
Assertions.assertLinesMatch(Files.lines(inputFile), Files.lines(outputFile));
5863
}
5964

6065
}

spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiRecordTypeFunctionalTests.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@
1616

1717
package org.springframework.batch.sample.iosample;
1818

19+
import java.nio.file.Files;
20+
import java.nio.file.Path;
21+
22+
import org.junit.jupiter.api.Assertions;
1923
import org.junit.jupiter.api.Test;
2024

2125
import org.springframework.batch.core.Job;
22-
import org.springframework.batch.test.AssertFile;
2326
import org.springframework.batch.test.JobLauncherTestUtils;
2427
import org.springframework.beans.factory.annotation.Autowired;
2528
import org.springframework.core.io.FileSystemResource;
@@ -54,7 +57,9 @@ void testJob(@Autowired Job job) throws Exception {
5457
jobLauncherTestUtils.launchJob();
5558

5659
// then
57-
AssertFile.assertFileEquals(new FileSystemResource(INPUT_FILE), new FileSystemResource(OUTPUT_FILE));
60+
Path inputFile = new FileSystemResource(INPUT_FILE).getFile().toPath();
61+
Path outputFile = new FileSystemResource(OUTPUT_FILE).getFile().toPath();
62+
Assertions.assertLinesMatch(Files.lines(inputFile), Files.lines(outputFile));
5863
}
5964

6065
}

spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
*
2929
* @author Dan Garrette
3030
* @author Glenn Renfro
31+
* @author Mahmoud Ben Hassine
3132
* @since 2.0
33+
* @deprecated since 5.0 (for removal in 5.2) in favor of test utilities provided by
34+
* modern test libraries like JUnit 5, AssertJ, etc.
3235
*/
36+
@Deprecated(since = "5.0", forRemoval = true)
3337
public abstract class AssertFile {
3438

3539
public static void assertFileEquals(File expected, File actual) throws Exception {

0 commit comments

Comments
 (0)