Skip to content

Commit 932e934

Browse files
fmbenhassinefmbenhassine
committed
Refine #4125
* Fix assertions * Update RecordFieldExtractorTests to use JUnit Jupiter
1 parent 83d01fb commit 932e934

File tree

3 files changed

+45
-50
lines changed

3 files changed

+45
-50
lines changed

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222

23-
import org.junit.Assert;
23+
import org.junit.jupiter.api.Assertions;
2424
import org.junit.jupiter.api.Test;
2525

2626
import org.springframework.batch.item.ExecutionContext;
@@ -461,11 +461,11 @@ record Person(int id, String name) {
461461

462462
// then
463463
Object lineMapper = ReflectionTestUtils.getField(reader, "lineMapper");
464-
Assert.assertNotNull(lineMapper);
465-
Assert.assertTrue(lineMapper instanceof DefaultLineMapper);
464+
Assertions.assertNotNull(lineMapper);
465+
Assertions.assertTrue(lineMapper instanceof DefaultLineMapper);
466466
Object fieldSetMapper = ReflectionTestUtils.getField(lineMapper, "fieldSetMapper");
467-
Assert.assertNotNull(fieldSetMapper);
468-
Assert.assertTrue(fieldSetMapper instanceof RecordFieldSetMapper);
467+
Assertions.assertNotNull(fieldSetMapper);
468+
Assertions.assertTrue(fieldSetMapper instanceof RecordFieldSetMapper);
469469
}
470470

471471
@Test
@@ -485,11 +485,11 @@ class Person {
485485

486486
// then
487487
Object lineMapper = ReflectionTestUtils.getField(reader, "lineMapper");
488-
Assert.assertNotNull(lineMapper);
489-
Assert.assertTrue(lineMapper instanceof DefaultLineMapper);
488+
Assertions.assertNotNull(lineMapper);
489+
Assertions.assertTrue(lineMapper instanceof DefaultLineMapper);
490490
Object fieldSetMapper = ReflectionTestUtils.getField(lineMapper, "fieldSetMapper");
491-
Assert.assertNotNull(fieldSetMapper);
492-
Assert.assertTrue(fieldSetMapper instanceof BeanWrapperFieldSetMapper);
491+
Assertions.assertNotNull(fieldSetMapper);
492+
Assertions.assertTrue(fieldSetMapper instanceof BeanWrapperFieldSetMapper);
493493
}
494494

495495
private Resource getResource(String contents) {

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.nio.charset.Charset;
2323
import java.util.Arrays;
2424

25-
import org.junit.Assert;
25+
import org.junit.jupiter.api.Assertions;
2626
import org.junit.jupiter.api.Test;
2727

2828
import org.springframework.batch.item.ExecutionContext;
@@ -257,11 +257,11 @@ record Person(int id, String name) {
257257

258258
// then
259259
Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator");
260-
Assert.assertNotNull(lineAggregator);
261-
Assert.assertTrue(lineAggregator instanceof DelimitedLineAggregator);
260+
Assertions.assertNotNull(lineAggregator);
261+
Assertions.assertTrue(lineAggregator instanceof DelimitedLineAggregator);
262262
Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor");
263-
Assert.assertNotNull(fieldExtractor);
264-
Assert.assertTrue(fieldExtractor instanceof RecordFieldExtractor);
263+
Assertions.assertNotNull(fieldExtractor);
264+
Assertions.assertTrue(fieldExtractor instanceof RecordFieldExtractor);
265265
}
266266

267267
@Test
@@ -282,11 +282,11 @@ class Person {
282282

283283
// then
284284
Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator");
285-
Assert.assertNotNull(lineAggregator);
286-
Assert.assertTrue(lineAggregator instanceof DelimitedLineAggregator);
285+
Assertions.assertNotNull(lineAggregator);
286+
Assertions.assertTrue(lineAggregator instanceof DelimitedLineAggregator);
287287
Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor");
288-
Assert.assertNotNull(fieldExtractor);
289-
Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
288+
Assertions.assertNotNull(fieldExtractor);
289+
Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
290290
}
291291

292292
@Test
@@ -300,11 +300,11 @@ public void testSetupDelimitedLineAggregatorWithNoItemType() throws IOException
300300

301301
// then
302302
Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator");
303-
Assert.assertNotNull(lineAggregator);
304-
Assert.assertTrue(lineAggregator instanceof DelimitedLineAggregator);
303+
Assertions.assertNotNull(lineAggregator);
304+
Assertions.assertTrue(lineAggregator instanceof DelimitedLineAggregator);
305305
Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor");
306-
Assert.assertNotNull(fieldExtractor);
307-
Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
306+
Assertions.assertNotNull(fieldExtractor);
307+
Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
308308
}
309309

310310
@Test
@@ -320,11 +320,11 @@ record Person(int id, String name) {
320320

321321
// then
322322
Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator");
323-
Assert.assertNotNull(lineAggregator);
324-
Assert.assertTrue(lineAggregator instanceof FormatterLineAggregator);
323+
Assertions.assertNotNull(lineAggregator);
324+
Assertions.assertTrue(lineAggregator instanceof FormatterLineAggregator);
325325
Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor");
326-
Assert.assertNotNull(fieldExtractor);
327-
Assert.assertTrue(fieldExtractor instanceof RecordFieldExtractor);
326+
Assertions.assertNotNull(fieldExtractor);
327+
Assertions.assertTrue(fieldExtractor instanceof RecordFieldExtractor);
328328
}
329329

330330
@Test
@@ -345,11 +345,11 @@ class Person {
345345

346346
// then
347347
Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator");
348-
Assert.assertNotNull(lineAggregator);
349-
Assert.assertTrue(lineAggregator instanceof FormatterLineAggregator);
348+
Assertions.assertNotNull(lineAggregator);
349+
Assertions.assertTrue(lineAggregator instanceof FormatterLineAggregator);
350350
Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor");
351-
Assert.assertNotNull(fieldExtractor);
352-
Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
351+
Assertions.assertNotNull(fieldExtractor);
352+
Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
353353
}
354354

355355
@Test
@@ -363,11 +363,11 @@ public void testSetupFormatterLineAggregatorWithNoItemType() throws IOException
363363

364364
// then
365365
Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator");
366-
Assert.assertNotNull(lineAggregator);
367-
Assert.assertTrue(lineAggregator instanceof FormatterLineAggregator);
366+
Assertions.assertNotNull(lineAggregator);
367+
Assertions.assertTrue(lineAggregator instanceof FormatterLineAggregator);
368368
Object fieldExtractor = ReflectionTestUtils.getField(lineAggregator, "fieldExtractor");
369-
Assert.assertNotNull(fieldExtractor);
370-
Assert.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
369+
Assertions.assertNotNull(fieldExtractor);
370+
Assertions.assertTrue(fieldExtractor instanceof BeanWrapperFieldExtractor);
371371
}
372372

373373
private void validateBuilderFlags(FlatFileItemWriter<Foo> writer, String encoding) {

‎spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecordFieldExtractorTests.java

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
*/
1616
package org.springframework.batch.item.file.transform;
1717

18-
import org.junit.Assert;
19-
import org.junit.Test;
18+
import org.junit.jupiter.api.Assertions;
19+
import org.junit.jupiter.api.Test;
2020

2121
/**
2222
* @author Mahmoud Ben Hassine
2323
*/
2424
public class RecordFieldExtractorTests {
2525

26-
@Test(expected = IllegalArgumentException.class)
26+
@Test
2727
public void testSetupWithNullTargetType() {
28-
new RecordFieldExtractor<>(null);
28+
Assertions.assertThrows(IllegalArgumentException.class, () -> new RecordFieldExtractor<>(null));
2929
}
3030

31-
@Test(expected = IllegalArgumentException.class)
31+
@Test
3232
public void testSetupWithNonRecordTargetType() {
3333
new RecordFieldExtractor<>(NonRecordType.class);
3434
}
@@ -43,8 +43,8 @@ public void testExtractFields() {
4343
Object[] fields = recordFieldExtractor.extract(person);
4444

4545
// then
46-
Assert.assertNotNull(fields);
47-
Assert.assertArrayEquals(new Object[] { 1, "foo" }, fields);
46+
Assertions.assertNotNull(fields);
47+
Assertions.assertArrayEquals(new Object[] { 1, "foo" }, fields);
4848
}
4949

5050
@Test
@@ -58,22 +58,17 @@ public void testExtractFieldsSubset() {
5858
Object[] fields = recordFieldExtractor.extract(person);
5959

6060
// then
61-
Assert.assertNotNull(fields);
62-
Assert.assertArrayEquals(new Object[] { "foo" }, fields);
61+
Assertions.assertNotNull(fields);
62+
Assertions.assertArrayEquals(new Object[] { "foo" }, fields);
6363
}
6464

65-
@Test(expected = IllegalArgumentException.class)
65+
@Test
6666
public void testInvalidComponentName() {
67-
// given
6867
RecordFieldExtractor<Person> recordFieldExtractor = new RecordFieldExtractor<>(Person.class);
6968
recordFieldExtractor.setNames("nonExistent");
7069
Person person = new Person(1, "foo");
7170

72-
// when
73-
recordFieldExtractor.extract(person);
74-
75-
// then
76-
// expected exception
71+
Assertions.assertThrows(IllegalArgumentException.class, () -> recordFieldExtractor.extract(person));
7772
}
7873

7974
public record Person(int id, String name) {

0 commit comments

Comments
 (0)