From 80229439e154ccd243dfbc108ac7f0b5752a28c1 Mon Sep 17 00:00:00 2001 From: stvort Date: Sat, 20 May 2023 13:36:01 +0400 Subject: [PATCH] 2023-01 spring-28-spring-batch test updated --- .../example/springbatch/config/ImportUserJobTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/2023-01/spring-28-spring-batch/src/test/java/ru/otus/example/springbatch/config/ImportUserJobTest.java b/2023-01/spring-28-spring-batch/src/test/java/ru/otus/example/springbatch/config/ImportUserJobTest.java index 4f7f194b..a470d8ae 100644 --- a/2023-01/spring-28-spring-batch/src/test/java/ru/otus/example/springbatch/config/ImportUserJobTest.java +++ b/2023-01/spring-28-spring-batch/src/test/java/ru/otus/example/springbatch/config/ImportUserJobTest.java @@ -6,14 +6,13 @@ 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.springframework.batch.test.AssertFile; import org.springframework.batch.test.JobLauncherTestUtils; import org.springframework.batch.test.JobRepositoryTestUtils; import org.springframework.batch.test.context.SpringBatchTest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.core.io.FileSystemResource; +import java.io.File; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.Objects; @@ -54,9 +53,6 @@ class ImportUserJobTest { StandardCharsets.UTF_8 ); - FileSystemResource expectedResult = new FileSystemResource(expectedResultFileName); - FileSystemResource actualResult = new FileSystemResource(TEST_OUTPUT_FILE_NAME); - Job job = jobLauncherTestUtils.getJob(); assertThat(job).isNotNull() .extracting(Job::getName) @@ -69,6 +65,7 @@ class ImportUserJobTest { JobExecution jobExecution = jobLauncherTestUtils.launchJob(parameters); assertThat(jobExecution.getExitStatus().getExitCode()).isEqualTo("COMPLETED"); - AssertFile.assertFileEquals(expectedResult, actualResult); + assertThat(new File(TEST_OUTPUT_FILE_NAME)) + .hasSameTextualContentAs(new File(expectedResultFileName), StandardCharsets.UTF_8); } } \ No newline at end of file