From 932e93428e7badfb3bb39df50e1dd23e1e811d19 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Wed, 27 Jul 2022 15:28:04 +0200 Subject: [PATCH] Refine #4125 * Fix assertions * Update RecordFieldExtractorTests to use JUnit Jupiter --- .../FlatFileItemReaderBuilderTests.java | 18 +++---- .../FlatFileItemWriterBuilderTests.java | 50 +++++++++---------- .../transform/RecordFieldExtractorTests.java | 27 ++++------ 3 files changed, 45 insertions(+), 50 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java index 0e5c65b23..9fd3ee14c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java @@ -20,7 +20,7 @@ import java.io.LineNumberReader; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.batch.item.ExecutionContext; @@ -461,11 +461,11 @@ public class FlatFileItemReaderBuilderTests { // then Object lineMapper = ReflectionTestUtils.getField(reader, "lineMapper"); - Assert.assertNotNull(lineMapper); - Assert.assertTrue(lineMapper instanceof DefaultLineMapper); + Assertions.assertNotNull(lineMapper); + Assertions.assertTrue(lineMapper instanceof DefaultLineMapper); Object fieldSetMapper = ReflectionTestUtils.getField(lineMapper, "fieldSetMapper"); - Assert.assertNotNull(fieldSetMapper); - Assert.assertTrue(fieldSetMapper instanceof RecordFieldSetMapper); + Assertions.assertNotNull(fieldSetMapper); + Assertions.assertTrue(fieldSetMapper instanceof RecordFieldSetMapper); } @Test @@ -485,11 +485,11 @@ public class FlatFileItemReaderBuilderTests { // then Object lineMapper = ReflectionTestUtils.getField(reader, "lineMapper"); - Assert.assertNotNull(lineMapper); - Assert.assertTrue(lineMapper instanceof DefaultLineMapper); + Assertions.assertNotNull(lineMapper); + Assertions.assertTrue(lineMapper instanceof DefaultLineMapper); Object fieldSetMapper = ReflectionTestUtils.getField(lineMapper, "fieldSetMapper"); - Assert.assertNotNull(fieldSetMapper); - Assert.assertTrue(fieldSetMapper instanceof BeanWrapperFieldSetMapper); + Assertions.assertNotNull(fieldSetMapper); + Assertions.assertTrue(fieldSetMapper instanceof BeanWrapperFieldSetMapper); } private Resource getResource(String contents) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java index fec9ba823..9d3a03493 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java @@ -22,7 +22,7 @@ import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.Arrays; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.batch.item.ExecutionContext; @@ -257,11 +257,11 @@ public class FlatFileItemWriterBuilderTests { // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); - Assert.assertNotNull(lineAggregator); - Assert.assertTrue(lineAggregator instanceof DelimitedLineAggregator); + Assertions.assertNotNull(lineAggregator); + Assertions.assertTrue(lineAggregator instanceof DelimitedLineAggregator); Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor"); - Assert.assertNotNull(fieldExtractor); - Assert.assertTrue(fieldExtractor instanceof RecordFieldExtractor); + Assertions.assertNotNull(fieldExtractor); + Assertions.assertTrue(fieldExtractor instanceof RecordFieldExtractor); } @Test @@ -282,11 +282,11 @@ public class FlatFileItemWriterBuilderTests { // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); - Assert.assertNotNull(lineAggregator); - Assert.assertTrue(lineAggregator instanceof DelimitedLineAggregator); + Assertions.assertNotNull(lineAggregator); + Assertions.assertTrue(lineAggregator instanceof DelimitedLineAggregator); Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor"); - Assert.assertNotNull(fieldExtractor); - Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); + Assertions.assertNotNull(fieldExtractor); + Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); } @Test @@ -300,11 +300,11 @@ public class FlatFileItemWriterBuilderTests { // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); - Assert.assertNotNull(lineAggregator); - Assert.assertTrue(lineAggregator instanceof DelimitedLineAggregator); + Assertions.assertNotNull(lineAggregator); + Assertions.assertTrue(lineAggregator instanceof DelimitedLineAggregator); Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor"); - Assert.assertNotNull(fieldExtractor); - Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); + Assertions.assertNotNull(fieldExtractor); + Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); } @Test @@ -320,11 +320,11 @@ public class FlatFileItemWriterBuilderTests { // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); - Assert.assertNotNull(lineAggregator); - Assert.assertTrue(lineAggregator instanceof FormatterLineAggregator); + Assertions.assertNotNull(lineAggregator); + Assertions.assertTrue(lineAggregator instanceof FormatterLineAggregator); Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor"); - Assert.assertNotNull(fieldExtractor); - Assert.assertTrue(fieldExtractor instanceof RecordFieldExtractor); + Assertions.assertNotNull(fieldExtractor); + Assertions.assertTrue(fieldExtractor instanceof RecordFieldExtractor); } @Test @@ -345,11 +345,11 @@ public class FlatFileItemWriterBuilderTests { // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); - Assert.assertNotNull(lineAggregator); - Assert.assertTrue(lineAggregator instanceof FormatterLineAggregator); + Assertions.assertNotNull(lineAggregator); + Assertions.assertTrue(lineAggregator instanceof FormatterLineAggregator); Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor"); - Assert.assertNotNull(fieldExtractor); - Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); + Assertions.assertNotNull(fieldExtractor); + Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); } @Test @@ -363,11 +363,11 @@ public class FlatFileItemWriterBuilderTests { // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); - Assert.assertNotNull(lineAggregator); - Assert.assertTrue(lineAggregator instanceof FormatterLineAggregator); + Assertions.assertNotNull(lineAggregator); + Assertions.assertTrue(lineAggregator instanceof FormatterLineAggregator); Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor"); - Assert.assertNotNull(fieldExtractor); - Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); + Assertions.assertNotNull(fieldExtractor); + Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor); } private void validateBuilderFlags(FlatFileItemWriter writer, String encoding) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecordFieldExtractorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecordFieldExtractorTests.java index f214dd73a..a49d45a31 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecordFieldExtractorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecordFieldExtractorTests.java @@ -15,20 +15,20 @@ */ package org.springframework.batch.item.file.transform; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Mahmoud Ben Hassine */ public class RecordFieldExtractorTests { - @Test(expected = IllegalArgumentException.class) + @Test public void testSetupWithNullTargetType() { - new RecordFieldExtractor<>(null); + Assertions.assertThrows(IllegalArgumentException.class, () -> new RecordFieldExtractor<>(null)); } - @Test(expected = IllegalArgumentException.class) + @Test public void testSetupWithNonRecordTargetType() { new RecordFieldExtractor<>(NonRecordType.class); } @@ -43,8 +43,8 @@ public class RecordFieldExtractorTests { Object[] fields = recordFieldExtractor.extract(person); // then - Assert.assertNotNull(fields); - Assert.assertArrayEquals(new Object[] { 1, "foo" }, fields); + Assertions.assertNotNull(fields); + Assertions.assertArrayEquals(new Object[] { 1, "foo" }, fields); } @Test @@ -58,22 +58,17 @@ public class RecordFieldExtractorTests { Object[] fields = recordFieldExtractor.extract(person); // then - Assert.assertNotNull(fields); - Assert.assertArrayEquals(new Object[] { "foo" }, fields); + Assertions.assertNotNull(fields); + Assertions.assertArrayEquals(new Object[] { "foo" }, fields); } - @Test(expected = IllegalArgumentException.class) + @Test public void testInvalidComponentName() { - // given RecordFieldExtractor recordFieldExtractor = new RecordFieldExtractor<>(Person.class); recordFieldExtractor.setNames("nonExistent"); Person person = new Person(1, "foo"); - // when - recordFieldExtractor.extract(person); - - // then - // expected exception + Assertions.assertThrows(IllegalArgumentException.class, () -> recordFieldExtractor.extract(person)); } public record Person(int id, String name) {