Start converting some unit tests to JUnit5; add new test base class t…

…o help (#1212)

src/test/java/com/fasterxml/jackson/core/BaseTest.java

@@ -12,6 +12,10 @@
 
 import junit.framework.TestCase;
 
+/**
+ * Base class for JUnit 4 based tests. To be deprecated from
+ * Jackson 2.18 or later.
+ */
 @SuppressWarnings("resource")
 public abstract class BaseTest
     extends TestCase

src/test/java/com/fasterxml/jackson/core/ErrorReportConfigurationTest.java

@@ -1,17 +1,22 @@
 package com.fasterxml.jackson.core;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import com.fasterxml.jackson.core.io.ContentReference;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.Test;
+
 /**
  * Unit tests for class {@link ErrorReportConfiguration}.
  * 
  * @since 2.16
  */
 public class ErrorReportConfigurationTest
-    extends BaseTest
+    extends JUnit5TestBase
 {
-
     /*
     /**********************************************************
     /* Unit Tests
@@ -24,6 +29,7 @@ public class ErrorReportConfigurationTest
 
     private final ErrorReportConfiguration DEFAULTS = ErrorReportConfiguration.defaults();
 
+    @Test
     public void testNormalBuild()
     {
         ErrorReportConfiguration config = ErrorReportConfiguration.builder()
@@ -35,6 +41,7 @@ public void testNormalBuild()
         assertEquals(2008, config.getMaxRawContentLength());
     }
 
+    @Test
     public void testZeroLengths()
     {
         // boundary tests, because we throw error on negative values
@@ -47,6 +54,7 @@ public void testZeroLengths()
         assertEquals(0, config.getMaxRawContentLength());
     }
 
+    @Test
     public void testInvalidMaxErrorTokenLength()
     {
         ErrorReportConfiguration.Builder builder = ErrorReportConfiguration.builder();
@@ -66,6 +74,7 @@ public void testInvalidMaxErrorTokenLength()
         }
     }
 
+    @Test
     public void testDefaults()
     {
         // default value
@@ -76,6 +85,7 @@ public void testDefaults()
         assertEquals(ErrorReportConfiguration.defaults(), ErrorReportConfiguration.defaults());
     }
 
+    @Test
     public void testOverrideDefaultErrorReportConfiguration()
     {
         // (1) override with null, will be no change
@@ -106,6 +116,7 @@ public void testOverrideDefaultErrorReportConfiguration()
         }
     }
 
+    @Test
     public void testRebuild()
     {
         ErrorReportConfiguration config = ErrorReportConfiguration.builder().build();
@@ -115,6 +126,7 @@ public void testRebuild()
         assertEquals(config.getMaxRawContentLength(), rebuiltConfig.getMaxRawContentLength());
     }
 
+    @Test
     public void testBuilderConstructorWithErrorReportConfiguration()
     {
         ErrorReportConfiguration configA = ErrorReportConfiguration.builder()
@@ -128,6 +140,7 @@ public void testBuilderConstructorWithErrorReportConfiguration()
         assertEquals(configA.getMaxRawContentLength(), configB.getMaxRawContentLength());
     }
 
+    @Test
     public void testWithJsonLocation() throws Exception
     {
         // Truncated result
@@ -138,6 +151,7 @@ public void testWithJsonLocation() throws Exception
         _verifyJsonLocationToString("abc", 4, "\"abc\"");
     }
 
+    @Test
     public void testWithJsonFactory() throws Exception
     {
         // default
@@ -160,6 +174,7 @@ public void testWithJsonFactory() throws Exception
                         .maxRawContentLength(0).build());
     }
 
+    @Test
     public void testExpectedTokenLengthWithConfigurations()
             throws Exception
     {
@@ -201,6 +216,7 @@ public void testExpectedTokenLengthWithConfigurations()
         }
     }
 
+    @Test
     public void testNonPositiveErrorTokenConfig()
     {
         // Zero should be ok
@@ -217,6 +233,7 @@ public void testNonPositiveErrorTokenConfig()
         }
     }
 
+    @Test
     public void testNullSetterThrowsException() {
         try {
             newStreamFactory().setErrorReportConfiguration(null);

src/test/java/com/fasterxml/jackson/core/JUnit5TestBase.java

@@ -0,0 +1,86 @@
+package com.fasterxml.jackson.core;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Intended replacement for {@link BaseTest}
+ */
+public class JUnit5TestBase
+{
+    /*
+    /**********************************************************************
+    /* Factory methods
+    /**********************************************************************
+     */
+
+    protected JsonFactory newStreamFactory() {
+        return new JsonFactory();
+    }
+
+    protected JsonFactoryBuilder streamFactoryBuilder() {
+        return (JsonFactoryBuilder) JsonFactory.builder();
+    }
+
+    /*
+    /**********************************************************************
+    /* Assertions
+    /**********************************************************************
+     */
+
+    protected void assertToken(JsonToken expToken, JsonToken actToken)
+    {
+        if (actToken != expToken) {
+            fail("Expected token "+expToken+", current token "+actToken);
+        }
+    }
+
+    protected void assertToken(JsonToken expToken, JsonParser p)
+    {
+        assertToken(expToken, p.currentToken());
+    }
+
+    /**
+     * @param e Exception to check
+     * @param anyMatches Array of Strings of which AT LEAST ONE ("any") has to be included
+     *    in {@code e.getMessage()} -- using case-INSENSITIVE comparison
+     */
+    public static void verifyException(Throwable e, String... anyMatches)
+    {
+        String msg = e.getMessage();
+        String lmsg = (msg == null) ? "" : msg.toLowerCase();
+        for (String match : anyMatches) {
+            String lmatch = match.toLowerCase();
+            if (lmsg.indexOf(lmatch) >= 0) {
+                return;
+            }
+        }
+        fail("Expected an exception with one of substrings ("+Arrays.asList(anyMatches)+"): got one with message \""+msg+"\"");
+    }
+
+    /*
+    /**********************************************************************
+    /* Escaping/quoting
+    /**********************************************************************
+     */
+
+    protected String q(String str) {
+        return '"'+str+'"';
+    }
+
+    protected String a2q(String json) {
+        return json.replace("'", "\"");
+    }
+
+    protected byte[] utf8Bytes(String str) {
+        return str.getBytes(StandardCharsets.UTF_8);
+    }
+
+    protected String utf8String(ByteArrayOutputStream bytes) {
+        return new String(bytes.toByteArray(), StandardCharsets.UTF_8);
+    }
+
+}