Convert MrBean; promote JUnit5 dep to parent level, remove per-module…

… JUnit5 deps
FasterXML · Jan 19, 2025 · 4ff30d6 · 4ff30d6
1 parent 6b5d24b
commit 4ff30d6
Show file tree

Hide file tree

Showing 25 changed files with 101 additions and 121 deletions.
diff --git a/afterburner/pom.xml b/afterburner/pom.xml
@@ -62,17 +62,6 @@ field access and method calls
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/android-record/pom.xml b/android-record/pom.xml
@@ -43,16 +43,6 @@
     </dependency>
 
     <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/blackbird/pom.xml b/blackbird/pom.xml
@@ -45,16 +45,6 @@ that uses LambdaMetafactory based code generation to replace reflection calls.
     </dependency>
 
     <!-- Test dependencies: -->
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/guice/pom.xml b/guice/pom.xml
@@ -52,16 +52,6 @@
         </dependency>
 
          <!-- Test dependencies -->
-         <dependency>
-             <groupId>org.junit.jupiter</groupId>
-             <artifactId>junit-jupiter</artifactId>
-             <scope>test</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.junit.jupiter</groupId>
-             <artifactId>junit-jupiter-api</artifactId>
-             <scope>test</scope>
-         </dependency>
     </dependencies>
 
   <build>

diff --git a/guice7/pom.xml b/guice7/pom.xml
@@ -51,17 +51,7 @@
             <version>${version.guice}</version>
         </dependency>
 
-         <!-- Test dependencies -->
-         <dependency>
-             <groupId>org.junit.jupiter</groupId>
-             <artifactId>junit-jupiter</artifactId>
-             <scope>test</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.junit.jupiter</groupId>
-             <artifactId>junit-jupiter-api</artifactId>
-             <scope>test</scope>
-         </dependency>
+        <!-- Test dependencies -->
     </dependencies>
 
   <build>

diff --git a/jakarta-xmlbind/pom.xml b/jakarta-xmlbind/pom.xml
@@ -75,17 +75,6 @@
       <version>2.1.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <!-- may also need JAXB impl for tests -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>

diff --git a/jaxb/pom.xml b/jaxb/pom.xml
@@ -74,17 +74,6 @@ for configuring data-binding.
       <version>1.2.2</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <!-- may also need JAXB impl for tests -->
     <!-- 20-May-2024, tatu: no longer needed it seems:
     <dependency>

diff --git a/mrbean/pom.xml b/mrbean/pom.xml
@@ -61,12 +61,6 @@ ${project.groupId}.mrbean.*;version=${project.version}
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/BaseTest.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/BaseTest.java
@@ -3,16 +3,13 @@
 import java.io.*;
 import java.util.Arrays;
 
-import junit.framework.TestCase;
-
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 
-//import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public abstract class BaseTest
-    extends TestCase
 {
     /*
     /**********************************************************

diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/RoundTripTest.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/RoundTripTest.java
@@ -1,7 +1,11 @@
 package com.fasterxml.jackson.module.mrbean;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class RoundTripTest extends BaseTest
 {
     public interface Bean {
@@ -14,6 +18,7 @@ public interface ReadOnlyBean {
     }
 
     // [mrbean#20]: naming convention caused under-score prefixed duplicates
+    @Test
     public void testSimple() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper()
@@ -25,6 +30,7 @@ public void testSimple() throws Exception
         assertEquals(input, output);
     }
 
+    @Test
     public void testSimpleWithoutSetter() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper()

diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java
@@ -1,7 +1,11 @@
 package com.fasterxml.jackson.module.mrbean;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TestAbstractClasses
     extends BaseTest
 {
@@ -34,6 +38,7 @@ protected Bean() { }
      */
 
     @SuppressWarnings("synthetic-access")
+    @Test
     public void testSimpleInteface() throws Exception
     {
         ObjectMapper mapper = newMrBeanMapper();

diff --git a/...n/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java b/...n/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java
@@ -1,8 +1,12 @@
 package com.fasterxml.jackson.module.mrbean;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TestAbstractClassesWithOverrides
     extends BaseTest
 {
@@ -74,6 +78,7 @@ public abstract static class CoffeeBeanLackingPublicMethod extends CoffeeBean
     /**********************************************************
      */
 
+    @Test
     public void testOverrides() throws Exception
     {
         ObjectMapper mapper = newMrBeanMapper();
@@ -86,6 +91,7 @@ public void testOverrides() throws Exception
     }
 
     @SuppressWarnings("synthetic-access")
+    @Test
     public void testReAbstractedMethods() throws Exception
     {
         AbstractTypeMaterializer mat = new AbstractTypeMaterializer();
@@ -130,6 +136,7 @@ private void verifyReAbstractedProperty(ObjectMapper mapper) throws com.fasterxm
         assertEquals("Another Foo!", beanWithOtherFoo.getFoo());
     }
 
+    @Test
     public void testEagerFailureOnReAbstractedMethods() throws Exception
     {
         AbstractTypeMaterializer mat = new AbstractTypeMaterializer();

diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestBridgeMethods.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestBridgeMethods.java
@@ -7,6 +7,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.junit.jupiter.api.Test;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Attribute;
 import org.objectweb.asm.ClassReader;
@@ -22,6 +23,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.module.mrbean.AbstractTypeMaterializer.MyClassLoader;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 // [modules-base#110]: avoid synthetic bridge method generation
 public class TestBridgeMethods extends BaseTest
 {
@@ -52,6 +55,7 @@ public interface SpecificCoffeeHolder extends GenericHolder<Coffee> {
         Coffee getObject();
     }
 
+    @Test
     public void testSimpleCovariantProperty() throws Exception
     {
         ObjectMapper mapper = newMrBeanMapper();
@@ -64,6 +68,7 @@ public void testSimpleCovariantProperty() throws Exception
         assertEquals("pumpkin spice", result.getDrink().getFlavor());
     }
 
+    @Test
     public void testGenericCovariantProperty() throws Exception
     {
         ObjectMapper mapper = newMrBeanMapper();

diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestGenericTypes.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestGenericTypes.java
@@ -6,6 +6,10 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TestGenericTypes
     extends BaseTest
 {
@@ -37,6 +41,7 @@ public interface InterfaceWithReference8 {
     /**
      * Test simple leaf-level bean with 2 implied _beanProperties
      */
+    @Test
     public void testSimpleInterface() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper().registerModule(new MrBeanModule());
@@ -50,6 +55,7 @@ public void testSimpleInterface() throws Exception
         assertEquals("foo", leaves.get(0).value);
     }
 
+    @Test
     public void testGenericInterface() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
@@ -68,6 +74,7 @@ public void testGenericInterface() throws Exception
         }
     }
 
+    @Test
     public void testGenericClass() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper()
@@ -87,6 +94,7 @@ public void testGenericClass() throws Exception
     }
 
     // for [mrbean#8]
+    @Test
     public void testWithGenericReferenceType() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper()

diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestJDKTypes.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestJDKTypes.java
@@ -3,11 +3,15 @@
 import java.io.Serializable;
 import java.util.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Tests stemming from [#12], where `Calendar` fails; however, bit more general
  * problem.
@@ -27,6 +31,7 @@ static class Bean117UsingJsonSerialize {
     private final ObjectMapper MAPPER = newMrBeanMapper();
     private final ObjectMapper VANILLA_MAPPER = newPlainJsonMapper();
 
+    @Test
     public void testDateTimeTypes() throws Exception
     {
         Calendar cal = MAPPER.readValue("0", Calendar.class);
@@ -38,6 +43,7 @@ public void testDateTimeTypes() throws Exception
         assertEquals(0L, dt.getTime());
     }
 
+    @Test
     public void testNumbers() throws Exception
     {
         Number nr = MAPPER.readValue("0", Number.class);
@@ -49,6 +55,7 @@ public void testNumbers() throws Exception
         assertSame(Double.class, nr.getClass());
     }
 
+    @Test
     public void testIterable() throws Exception
     {
         Object ob = MAPPER.readValue("[ ]", Iterable.class);
@@ -63,13 +70,15 @@ public void testIterable() throws Exception
         assertEquals(Integer.valueOf(123), l.get(0));
     }
 
+    @Test
     public void testStringLike() throws Exception
     {
         CharSequence seq = MAPPER.readValue(q("abc"), CharSequence.class);
         assertEquals("abc", (String) seq);
     }
 
     // [modules-base#74]: more types to skip
+    @Test
     public void testSerializable() throws Exception
     {
 //        Serializable value = MAPPER.readValue(quote("abc"), Serializable.class);
@@ -78,6 +87,7 @@ public void testSerializable() throws Exception
     }
 
     // Extra test inspired by Afterburner report
+    @Test
     public void testIntAsString() throws Exception
     {
         final String EXP_JSON = "{\"value\":\"42\"}";
@@ -92,6 +102,7 @@ public void testIntAsString() throws Exception
     }
 
     // [modules-base#132]: Don't block "java.util.TimeZone"
+    @Test
     public void testUtilTimeZone() throws Exception
     {
         final String json = q("PST");