Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine #4125

Browse Source 
* Fix assertions
* Update RecordFieldExtractorTests to use JUnit Jupiter
This commit is contained in:
Mahmoud Ben Hassine
2022-07-27 15:28:04 +02:00
parent 83d01fbfca
commit 932e93428e
3 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java
View File

@@ -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) {

50
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java
View File

@@ -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<Foo> writer, String encoding) {

27
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecordFieldExtractorTests.java
View File

@@ -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<Person> 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) {