diff --git a/guice/pom.xml b/guice/pom.xml index 7c897899..85e052c6 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -55,12 +55,17 @@ ${version.guice} - - - junit - junit - test - + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + diff --git a/guice/src/test/java/module-info.java b/guice/src/test/java/module-info.java index 704d72fd..e1bb7265 100644 --- a/guice/src/test/java/module-info.java +++ b/guice/src/test/java/module-info.java @@ -17,7 +17,8 @@ // Additional test lib/framework dependencies - requires junit; // JUnit4 To Be Removed in future + requires org.junit.jupiter.api; + requires org.junit.jupiter.params; // Further, need to open up some packages for JUnit et al opens tools.jackson.module.guice; diff --git a/guice/src/test/java/tools/jackson/module/guice/ExtendInjectableTest.java b/guice/src/test/java/tools/jackson/module/guice/ExtendInjectableTest.java index a46ef772..4ea8d733 100644 --- a/guice/src/test/java/tools/jackson/module/guice/ExtendInjectableTest.java +++ b/guice/src/test/java/tools/jackson/module/guice/ExtendInjectableTest.java @@ -1,20 +1,21 @@ package tools.jackson.module.guice; -import com.fasterxml.jackson.annotation.JacksonInject; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import javax.inject.Inject; -import tools.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import org.junit.Assert; -import org.junit.Test; -import javax.inject.Inject; +import com.fasterxml.jackson.annotation.*; + +import tools.jackson.databind.ObjectMapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** */ @@ -64,9 +65,9 @@ public void configure(Binder binder) final ReadableBean bean = mapper.readValue("{\"constructor_value\":\"myConstructor\",\"field_value\":\"myField\",\"method_value\":\"myMethod\"}", ReadableBean.class); - Assert.assertEquals("myConstructor", bean.constructorValue); - Assert.assertEquals("myMethod", bean.methodValue); - Assert.assertEquals("myField", bean.fieldValue); + assertEquals("myConstructor", bean.constructorValue); + assertEquals("myMethod", bean.methodValue); + assertEquals("myField", bean.fieldValue); verifyInjections("From Jackson's ObjectMapper", bean); @@ -74,20 +75,20 @@ public void configure(Binder binder) private void verifyInjections(String message, InjectableBean injected) { - Assert.assertSame(message, constructorInjected, injected.constructorInjected); - Assert.assertSame(message, constructorInjectedWithJavaAnnotation, injected.constructorInjectedWithJavaAnnotation); - Assert.assertSame(message, constructorInjectedWithGuiceAnnotation, injected.constructorInjectedWithGuiceAnnotation); - Assert.assertSame(message, constructorInjectedWithCustomAnnotation, injected.constructorInjectedWithCustomAnnotation); - - Assert.assertSame(message, methodInjected, injected.methodInjected); - Assert.assertSame(message, methodInjectedWithJavaAnnotation, injected.methodInjectedWithJavaAnnotation); - Assert.assertSame(message, methodInjectedWithGuiceAnnotation, injected.methodInjectedWithGuiceAnnotation); - Assert.assertSame(message, methodInjectedWithCustomAnnotation, injected.methodInjectedWithCustomAnnotation); - - Assert.assertSame(message, fieldInjected, injected.fieldInjected); - Assert.assertSame(message, fieldInjectedWithJavaAnnotation, injected.fieldInjectedWithJavaAnnotation); - Assert.assertSame(message, fieldInjectedWithGuiceAnnotation, injected.fieldInjectedWithGuiceAnnotation); - Assert.assertSame(message, fieldInjectedWithCustomAnnotation, injected.fieldInjectedWithCustomAnnotation); + assertSame(constructorInjected, injected.constructorInjected); + assertSame(constructorInjectedWithJavaAnnotation, injected.constructorInjectedWithJavaAnnotation); + assertSame(constructorInjectedWithGuiceAnnotation, injected.constructorInjectedWithGuiceAnnotation); + assertSame(constructorInjectedWithCustomAnnotation, injected.constructorInjectedWithCustomAnnotation); + + assertSame(methodInjected, injected.methodInjected); + assertSame(methodInjectedWithJavaAnnotation, injected.methodInjectedWithJavaAnnotation); + assertSame(methodInjectedWithGuiceAnnotation, injected.methodInjectedWithGuiceAnnotation); + assertSame(methodInjectedWithCustomAnnotation, injected.methodInjectedWithCustomAnnotation); + + assertSame(fieldInjected, injected.fieldInjected); + assertSame(fieldInjectedWithJavaAnnotation, injected.fieldInjectedWithJavaAnnotation); + assertSame(fieldInjectedWithGuiceAnnotation, injected.fieldInjectedWithGuiceAnnotation); + assertSame(fieldInjectedWithCustomAnnotation, injected.fieldInjectedWithCustomAnnotation); } /* ===================================================================== */ diff --git a/guice/src/test/java/tools/jackson/module/guice/ObjectMapperModuleTest.java b/guice/src/test/java/tools/jackson/module/guice/ObjectMapperModuleTest.java index 3aadc2df..c93ab0ee 100644 --- a/guice/src/test/java/tools/jackson/module/guice/ObjectMapperModuleTest.java +++ b/guice/src/test/java/tools/jackson/module/guice/ObjectMapperModuleTest.java @@ -2,6 +2,15 @@ import java.math.BigInteger; +import org.junit.jupiter.api.Test; + +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.name.Names; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; @@ -12,15 +21,7 @@ import tools.jackson.databind.SerializationContext; import tools.jackson.databind.module.SimpleModule; -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.name.Names; - -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ObjectMapperModuleTest { @@ -65,7 +66,7 @@ public void testModulesRegisteredThroughNormalInstantiation() throws Exception final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -77,7 +78,7 @@ public void testModulesRegisteredThroughInjection() throws Exception final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -97,7 +98,7 @@ public void configure(Binder binder) final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -119,7 +120,7 @@ public void configure(Binder binder) final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -131,7 +132,7 @@ public void testModulesRegisteredThroughInjectionWithKey() throws Exception final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } private static class SomeBean @@ -186,15 +187,15 @@ private void injectNine(long n) public boolean verify() { - Assert.assertEquals(1, one); - Assert.assertEquals(2, two); - Assert.assertEquals(3, three); - Assert.assertEquals(4, four); - Assert.assertEquals(5, five); - Assert.assertEquals(6, six); - Assert.assertEquals(7, seven); - Assert.assertEquals(8, eight); - Assert.assertEquals(9, nine); + assertEquals(1, one); + assertEquals(2, two); + assertEquals(3, three); + assertEquals(4, four); + assertEquals(5, five); + assertEquals(6, six); + assertEquals(7, seven); + assertEquals(8, eight); + assertEquals(9, nine); return true; } diff --git a/guice7/pom.xml b/guice7/pom.xml index d3a3af04..15ac5ce5 100644 --- a/guice7/pom.xml +++ b/guice7/pom.xml @@ -55,12 +55,17 @@ ${version.guice} - - - junit - junit - test - + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + diff --git a/guice7/src/test/java/module-info.java b/guice7/src/test/java/module-info.java index 37c1b162..38d415a9 100644 --- a/guice7/src/test/java/module-info.java +++ b/guice7/src/test/java/module-info.java @@ -15,7 +15,8 @@ // Additional test lib/framework dependencies - requires junit; // JUnit4 To Be Removed in future + requires org.junit.jupiter.api; + requires org.junit.jupiter.params; // Further, need to open up some packages for JUnit et al opens tools.jackson.module.guice7; diff --git a/guice7/src/test/java/tools/jackson/module/guice7/ExtendInjectableTest.java b/guice7/src/test/java/tools/jackson/module/guice7/ExtendInjectableTest.java index eee02fde..16ba3e34 100644 --- a/guice7/src/test/java/tools/jackson/module/guice7/ExtendInjectableTest.java +++ b/guice7/src/test/java/tools/jackson/module/guice7/ExtendInjectableTest.java @@ -1,20 +1,21 @@ package tools.jackson.module.guice7; -import com.fasterxml.jackson.annotation.JacksonInject; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.inject.Inject; -import tools.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; -import org.junit.Assert; -import org.junit.Test; -import jakarta.inject.Inject; +import com.fasterxml.jackson.annotation.*; + +import tools.jackson.databind.ObjectMapper; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; public class ExtendInjectableTest { @@ -62,9 +63,9 @@ public void configure(Binder binder) final ReadableBean bean = mapper.readValue("{\"constructor_value\":\"myConstructor\",\"field_value\":\"myField\",\"method_value\":\"myMethod\"}", ReadableBean.class); - Assert.assertEquals("myConstructor", bean.constructorValue); - Assert.assertEquals("myMethod", bean.methodValue); - Assert.assertEquals("myField", bean.fieldValue); + assertEquals("myConstructor", bean.constructorValue); + assertEquals("myMethod", bean.methodValue); + assertEquals("myField", bean.fieldValue); verifyInjections("From Jackson's ObjectMapper", bean); @@ -72,20 +73,20 @@ public void configure(Binder binder) private void verifyInjections(String message, InjectableBean injected) { - Assert.assertSame(message, constructorInjected, injected.constructorInjected); - Assert.assertSame(message, constructorInjectedWithJavaAnnotation, injected.constructorInjectedWithJavaAnnotation); - Assert.assertSame(message, constructorInjectedWithGuiceAnnotation, injected.constructorInjectedWithGuiceAnnotation); - Assert.assertSame(message, constructorInjectedWithCustomAnnotation, injected.constructorInjectedWithCustomAnnotation); - - Assert.assertSame(message, methodInjected, injected.methodInjected); - Assert.assertSame(message, methodInjectedWithJavaAnnotation, injected.methodInjectedWithJavaAnnotation); - Assert.assertSame(message, methodInjectedWithGuiceAnnotation, injected.methodInjectedWithGuiceAnnotation); - Assert.assertSame(message, methodInjectedWithCustomAnnotation, injected.methodInjectedWithCustomAnnotation); - - Assert.assertSame(message, fieldInjected, injected.fieldInjected); - Assert.assertSame(message, fieldInjectedWithJavaAnnotation, injected.fieldInjectedWithJavaAnnotation); - Assert.assertSame(message, fieldInjectedWithGuiceAnnotation, injected.fieldInjectedWithGuiceAnnotation); - Assert.assertSame(message, fieldInjectedWithCustomAnnotation, injected.fieldInjectedWithCustomAnnotation); + assertSame(constructorInjected, injected.constructorInjected); + assertSame(constructorInjectedWithJavaAnnotation, injected.constructorInjectedWithJavaAnnotation); + assertSame(constructorInjectedWithGuiceAnnotation, injected.constructorInjectedWithGuiceAnnotation); + assertSame(constructorInjectedWithCustomAnnotation, injected.constructorInjectedWithCustomAnnotation); + + assertSame(methodInjected, injected.methodInjected); + assertSame(methodInjectedWithJavaAnnotation, injected.methodInjectedWithJavaAnnotation); + assertSame(methodInjectedWithGuiceAnnotation, injected.methodInjectedWithGuiceAnnotation); + assertSame(methodInjectedWithCustomAnnotation, injected.methodInjectedWithCustomAnnotation); + + assertSame(fieldInjected, injected.fieldInjected); + assertSame(fieldInjectedWithJavaAnnotation, injected.fieldInjectedWithJavaAnnotation); + assertSame(fieldInjectedWithGuiceAnnotation, injected.fieldInjectedWithGuiceAnnotation); + assertSame(fieldInjectedWithCustomAnnotation, injected.fieldInjectedWithCustomAnnotation); } /* ===================================================================== */ diff --git a/guice7/src/test/java/tools/jackson/module/guice7/ObjectMapperModuleTest.java b/guice7/src/test/java/tools/jackson/module/guice7/ObjectMapperModuleTest.java index 0eda7356..b822bd6d 100644 --- a/guice7/src/test/java/tools/jackson/module/guice7/ObjectMapperModuleTest.java +++ b/guice7/src/test/java/tools/jackson/module/guice7/ObjectMapperModuleTest.java @@ -2,6 +2,15 @@ import java.math.BigInteger; +import org.junit.jupiter.api.Test; + +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.Module; +import com.google.inject.name.Names; + import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; @@ -13,15 +22,7 @@ import tools.jackson.databind.SerializationContext; import tools.jackson.databind.module.SimpleModule; -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.Module; -import com.google.inject.name.Names; - -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ObjectMapperModuleTest { @@ -66,7 +67,7 @@ public void testModulesRegisteredThroughNormalInstantiation() throws Exception final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -78,7 +79,7 @@ public void testModulesRegisteredThroughInjection() throws Exception final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -98,7 +99,7 @@ public void configure(Binder binder) final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -120,7 +121,7 @@ public void configure(Binder binder) final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } @Test @@ -132,7 +133,7 @@ public void testModulesRegisteredThroughInjectionWithKey() throws Exception final ObjectMapper mapper = injector.getInstance(ObjectMapper.class); - Assert.assertEquals(mapper.writeValueAsString(Integer.valueOf(10)), "\"A\""); + assertEquals(mapper.writeValueAsString(10), "\"A\""); } private static class SomeBean @@ -187,15 +188,15 @@ private void injectNine(long n) public boolean verify() { - Assert.assertEquals(1, one); - Assert.assertEquals(2, two); - Assert.assertEquals(3, three); - Assert.assertEquals(4, four); - Assert.assertEquals(5, five); - Assert.assertEquals(6, six); - Assert.assertEquals(7, seven); - Assert.assertEquals(8, eight); - Assert.assertEquals(9, nine); + assertEquals(1, one); + assertEquals(2, two); + assertEquals(3, three); + assertEquals(4, four); + assertEquals(5, five); + assertEquals(6, six); + assertEquals(7, seven); + assertEquals(8, eight); + assertEquals(9, nine); return true; }