[ JSTEP-10 ] Migrate csv module tests to JUnit 5 (#525)

FasterXML · Jan 12, 2025 · c702930 · c702930
1 parent 9359af8
commit c702930
Show file tree

Hide file tree

Showing 76 changed files with 669 additions and 240 deletions.
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/CSVFactoryFeaturesTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/CSVFactoryFeaturesTest.java
@@ -1,13 +1,20 @@
 package com.fasterxml.jackson.dataformat.csv;
 
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.StreamReadFeature;
 import com.fasterxml.jackson.core.StreamWriteFeature;
 
-import java.io.StringReader;
-import java.io.StringWriter;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 public class CSVFactoryFeaturesTest extends ModuleTestBase
 {
+    @Test
     public void testFactoryFeatures() throws Exception
     {
         CsvFactory f = new CsvFactory();
@@ -31,6 +38,7 @@ public void testFactoryFeatures() throws Exception
         g.close();
     }
 
+    @Test
     public void testFactoryFastFeatures() throws Exception
     {
         CsvFactory f = new CsvFactory();
@@ -46,6 +54,7 @@ public void testFactoryFastFeatures() throws Exception
         assertTrue(generator.isEnabled(StreamWriteFeature.USE_FAST_DOUBLE_WRITER));
     }
 
+    @Test
     public void testFactoryFastBigNumberFeature() throws Exception
     {
         CsvFactory f = new CsvFactory();
@@ -57,6 +66,7 @@ public void testFactoryFastBigNumberFeature() throws Exception
         assertTrue(parser.isEnabled(StreamReadFeature.USE_FAST_BIG_NUMBER_PARSER));
     }
 
+    @Test
     public void testFactoryBuilderFastFeatures() throws Exception
     {
         CsvFactory f = CsvFactory.builder()
@@ -73,6 +83,7 @@ public void testFactoryBuilderFastFeatures() throws Exception
         assertTrue(generator.isEnabled(StreamWriteFeature.USE_FAST_DOUBLE_WRITER));
     }
 
+    @Test
     public void testFactoryBuilderFastBigNumberFeature() throws Exception
     {
         CsvFactory f = CsvFactory.builder()

diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java
@@ -1,19 +1,16 @@
 package com.fasterxml.jackson.dataformat.csv;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
-import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.core.*;
 
-public abstract class ModuleTestBase extends junit.framework.TestCase
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public abstract class ModuleTestBase
 {
     public enum Gender { MALE, FEMALE };
 
@@ -332,4 +329,5 @@ protected byte[] readResource(String ref)
        }
        return bytes.toByteArray();
     }
+
 }
diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/NullReader122Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/NullReader122Test.java
@@ -1,15 +1,21 @@
 package com.fasterxml.jackson.dataformat.csv;
 
-import java.io.*;
+import java.io.Reader;
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.ObjectReader;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
+
 public class NullReader122Test extends ModuleTestBase
 {
     private final CsvMapper MAPPER = mapperForCsv();
 
     // for [dataformats-text#122]: passing `null` Reader leads to infinite loop
+    @Test
     public void testEmptyStream() throws Exception {
         CsvSchema columns = CsvSchema.emptySchema().withHeader().withColumnSeparator(';');
         ObjectReader r = MAPPER.readerFor(Map.class).with(columns);

diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/SchemaCaching288Test.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/SchemaCaching288Test.java
@@ -1,8 +1,13 @@
 package com.fasterxml.jackson.dataformat.csv;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonView;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
 public class SchemaCaching288Test extends ModuleTestBase
 {
     static class ViewA { }
@@ -28,6 +33,7 @@ static class Bean288
      */
 
     // [dataformats-text#288]: caching should not overlap with View
+    @Test
     public void testCachingNoViewFirst() throws Exception
     {
         CsvMapper mapper1 = mapperForCsv();
@@ -52,6 +58,7 @@ public void testCachingNoViewFirst() throws Exception
     }
 
     // [dataformats-text#288]: caching should not overlap with View
+    @Test
     public void testCachingWithViewFirst() throws Exception
     {
         CsvMapper mapper1 = mapperForCsv();

diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/TestVersions.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/TestVersions.java
@@ -1,12 +1,18 @@
 package com.fasterxml.jackson.dataformat.csv;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.Versioned;
 import com.fasterxml.jackson.databind.MapperFeature;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TestVersions extends ModuleTestBase
 {
+    @Test
     public void testMapperVersions() throws IOException
     {
         CsvFactory f = new CsvFactory();
@@ -20,6 +26,7 @@ public void testMapperVersions() throws IOException
     }
 
     // Mostly to verify #11
+    @Test
     public void testMapperDefaults()
     {
         CsvMapper mapper = new CsvMapper();
@@ -28,6 +35,7 @@ public void testMapperDefaults()
 
     // Also, not strictly related to version but...
 
+    @Test
     public void testMapperCopy() 
     {
         CsvMapper mapper = new CsvMapper();

diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/AnySetterTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/AnySetterTest.java
@@ -1,10 +1,15 @@
 package com.fasterxml.jackson.dataformat.csv.deser;
 
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.dataformat.csv.*;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class AnySetterTest extends ModuleTestBase
 {
     static class Entry {
@@ -29,6 +34,7 @@ public void set(String key, Object value) {
     /**********************************************************************
      */
 
+    @Test
     public void testSimpleHeader() throws Exception
     {
         CsvMapper mapper = mapperForCsv();
@@ -42,6 +48,7 @@ public void testSimpleHeader() throws Exception
     }
 
     // [dataformat-csv@109]: allow "any-setter-like"
+    @Test
     public void testWithMapToAny() throws Exception
     {
         CsvMapper mapper = mapperForCsv();

diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/ArrayReadTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/ArrayReadTest.java
@@ -1,11 +1,13 @@
 package com.fasterxml.jackson.dataformat.csv.deser;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.dataformat.csv.*;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 // for [dataformat-csv#57]
 public class ArrayReadTest extends ModuleTestBase
 {
@@ -32,6 +34,7 @@ public ValueEntry(@JsonProperty("id") String id,
 
     private final CsvMapper MAPPER = mapperForCsv();
 
+    @Test
     public void testSimpleExplicitLooseTyping() throws Exception
     {
         ValueEntry value = MAPPER.readerWithSchemaFor(ValueEntry.class)
@@ -48,6 +51,7 @@ public void testSimpleExplicitLooseTyping() throws Exception
     }
 
     // Same as above, but Array value in double-quotes:
+    @Test
     public void testSimpleExplicitLooseTypingWithQuotes() throws Exception
     {
         ValueEntry value = MAPPER.readerWithSchemaFor(ValueEntry.class)
@@ -63,6 +67,7 @@ public void testSimpleExplicitLooseTypingWithQuotes() throws Exception
         assertEquals(3, v[2]);
     }
 
+    @Test
     public void testSimpleExplicitStrictTyping() throws Exception
     {
         ValueEntry value = MAPPER.readerWithTypedSchemaFor(ValueEntry.class)
@@ -88,6 +93,7 @@ public void testSimpleExplicitStrictTyping() throws Exception
         assertEquals(0, v.length);
     }
 
+    @Test
     public void testSeparatorOverrideSpace() throws Exception
     {
         ValueEntry input = new ValueEntry("foo", "stuff", new int[] {1, 2, 3});
@@ -113,6 +119,7 @@ public void testSeparatorOverrideSpace() throws Exception
         assertEquals(3, v[2]);
     }
 
+    @Test
     public void testSeparatorOverrideMulti() throws Exception
     {
         ValueEntry input = new ValueEntry("foo", "stuff", new int[] {1, 2, 3});