diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/BaseTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/BaseTest.java index 2d8e9a59..3c474f32 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/BaseTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/BaseTest.java @@ -5,7 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate4.Hibernate4Module; -public abstract class BaseTest extends junit.framework.TestCase +import static org.junit.jupiter.api.Assertions.fail; + +public abstract class BaseTest { protected BaseTest() { } diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ForceLazyLoadingTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ForceLazyLoadingTest.java index 97122b68..1c5fa6b8 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ForceLazyLoadingTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ForceLazyLoadingTest.java @@ -4,7 +4,8 @@ import com.fasterxml.jackson.datatype.hibernate4.data.Customer; import com.fasterxml.jackson.datatype.hibernate4.data.Payment; import org.hibernate.Hibernate; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -12,6 +13,8 @@ import java.util.Map; import java.util.Set; +import static org.junit.jupiter.api.Assertions.*; + public class ForceLazyLoadingTest extends BaseTest { // [Issue#15] diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/HibernateTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/HibernateTest.java index 71b110f5..d9b5a4b0 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/HibernateTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/HibernateTest.java @@ -5,23 +5,24 @@ import javax.persistence.Persistence; import javax.persistence.Query; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.*; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate4.data.Customer; import com.fasterxml.jackson.datatype.hibernate4.data.Employee; +import static org.junit.jupiter.api.Assertions.*; + public class HibernateTest extends BaseTest { protected EntityManagerFactory emf; - @Override + @BeforeEach public void setUp() { emf = Persistence.createEntityManagerFactory("persistenceUnit"); } - - @Override + + @AfterEach public void tearDown() { if (emf!=null) { emf.close(); @@ -37,7 +38,7 @@ public void tearDown() { @Test public void testGetEntityManager() { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); } @Test @@ -58,7 +59,7 @@ public void testGetCustomerJson() throws Exception { @Test public void testAllCustomersJson() throws Exception { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); Query query = em.createQuery("select c from Customer c"); // false -> no forcing of lazy loading @@ -85,8 +86,8 @@ public void testCyclesJson() throws Exception { EntityManager em = emf.createEntityManager(); Employee salesEmployee = em.find(Employee.class, 1370); - Assert.assertNotNull(salesEmployee); - Assert.assertTrue(salesEmployee.getCustomers().size()>0); + assertNotNull(salesEmployee); + assertTrue(salesEmployee.getCustomers().size()>0); // false -> no forcing of lazy loading ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InclusionTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InclusionTest.java index fe939559..f0cd02f3 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InclusionTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InclusionTest.java @@ -2,9 +2,13 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class InclusionTest extends BaseTest { static class Mock @@ -14,6 +18,7 @@ static class Mock } // [hibernate#65] + @Test public void testInclusion() throws Exception { final ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InfiniteRecursion70Test.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InfiniteRecursion70Test.java index 3a34ec92..6ecb3908 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InfiniteRecursion70Test.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/InfiniteRecursion70Test.java @@ -5,13 +5,17 @@ import javax.persistence.Persistence; import org.hibernate.Hibernate; +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate4.data.Contrato; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class InfiniteRecursion70Test extends BaseTest { // [datatype-hibernate#70] + @Test public void testInfinite() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/LazyLoadingTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/LazyLoadingTest.java index 0a638dbf..8b442153 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/LazyLoadingTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/LazyLoadingTest.java @@ -13,7 +13,9 @@ import com.fasterxml.jackson.datatype.hibernate4.data.Payment; import org.hibernate.Hibernate; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class LazyLoadingTest extends BaseTest { diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/MissingEntitiesAsNullTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/MissingEntitiesAsNullTest.java index 43e084f3..48e9b69d 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/MissingEntitiesAsNullTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/MissingEntitiesAsNullTest.java @@ -8,12 +8,17 @@ import org.hibernate.Hibernate; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate4.data.Customer; +import static org.junit.jupiter.api.Assertions.*; + // [Issue#125] public class MissingEntitiesAsNullTest extends BaseTest { + @Test public void testMissingProductWhenMissing() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -39,6 +44,7 @@ public void testMissingProductWhenMissing() throws Exception { } } + @Test public void testProductWithValidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -66,6 +72,7 @@ public void testProductWithValidForeignKey() throws Exception { // caused by javax.persistence.EntityNotFoundException: Unable to find // com.fasterxml.jackson.datatype.hibernate4.data.Product with id X10_1678 + @Test public void testExceptionWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -90,6 +97,7 @@ public void testExceptionWithInvalidForeignKey() throws Exception { } } + @Test public void testWriteAsNullWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/OneToManyTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/OneToManyTest.java index ad6ca701..51173d39 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/OneToManyTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/OneToManyTest.java @@ -4,8 +4,12 @@ import javax.persistence.OneToMany; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class OneToManyTest extends BaseTest { static final String EXPECTED_JSON = "{\"m\":{\"A\":\"A\"}}"; @@ -18,7 +22,8 @@ static final class X { static final class Y { public final Map m = new LinkedHashMap(); } - + + @Test public void testMap() throws Exception { Y object = new Y(); object.m.put("A", "A"); @@ -26,7 +31,8 @@ public void testMap() throws Exception { assertEquals(EXPECTED_JSON, mapWithoutHibernateModule(object)); assertEquals(EXPECTED_JSON, mapWithHibernateModule(object)); } - + + @Test public void testMapWithOneToMany() throws Exception { X object = new X(); object.m.put("A", "A"); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/Polymorphic81Test.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/Polymorphic81Test.java index cc8c6378..96a8b3e6 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/Polymorphic81Test.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/Polymorphic81Test.java @@ -2,9 +2,13 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class Polymorphic81Test extends BaseTest { static class TestLayout { @@ -59,6 +63,7 @@ public static Expression simpleFieldExpression(String field) { } } + @Test public void testPolymorphic81() throws Exception { final ObjectMapper mapper = mapperWithModule(true); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ReplacePersistentCollectionTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ReplacePersistentCollectionTest.java index 20d6d3a8..4fd234cd 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ReplacePersistentCollectionTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/ReplacePersistentCollectionTest.java @@ -5,10 +5,8 @@ import com.fasterxml.jackson.datatype.hibernate4.data.Customer; import com.fasterxml.jackson.datatype.hibernate4.data.Payment; import org.hibernate.Hibernate; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.*; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -16,19 +14,21 @@ import java.util.Map; import java.util.Set; +import static org.junit.jupiter.api.Assertions.*; + public class ReplacePersistentCollectionTest { private EntityManagerFactory emf; private EntityManager em; - @Before + @BeforeEach public void setUp() throws Exception { emf = Persistence.createEntityManagerFactory("persistenceUnit"); em = emf.createEntityManager(); } - @After + @AfterEach public void tearDown() throws Exception { em.close(); emf.close(); @@ -43,9 +43,9 @@ public void testNoReplacePersistentCollection() throws Exception { ).enableDefaultTyping(); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertTrue(json.contains("org.hibernate.collection")); + assertTrue(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); /* @@ -54,9 +54,9 @@ public void testNoReplacePersistentCollection() throws Exception { System.out.println("--- /JSON ---"); */ - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); // TODO: verify - Assert.assertNotNull(json); + assertNotNull(json); boolean exceptionThrown = false; try { @@ -64,7 +64,7 @@ public void testNoReplacePersistentCollection() throws Exception { } catch (JsonMappingException e) { exceptionThrown = true; } - Assert.assertTrue(exceptionThrown); + assertTrue(exceptionThrown); } // [Issue#93], backwards compatible case @@ -77,9 +77,9 @@ public void testReplacePersistentCollection() throws Exception { ).enableDefaultTyping(); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertFalse(json.contains("org.hibernate.collection")); + assertFalse(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); /* @@ -88,9 +88,9 @@ public void testReplacePersistentCollection() throws Exception { System.out.println("--- /JSON ---"); */ - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); // TODO: verify - Assert.assertNotNull(json); + assertNotNull(json); /* * Currently this cannot be verified due to Issue#94 default typing fails on 2.7.0 - 2.8.2-SNAPSHOT, @@ -104,12 +104,12 @@ public void testReplacePersistentCollection() throws Exception { issue94failed = true; } - Assert.assertTrue("If this fails, means #94 is fixed. Replace to the below commented lines", issue94failed); + assertTrue(issue94failed, "If this fails, means #94 is fixed. Replace to the below commented lines"); // Map stuff = mapper.readValue(json, Map.class); // -// Assert.assertTrue(stuff.containsKey("payments")); -// Assert.assertTrue(stuff.containsKey("orders")); -// Assert.assertNull(stuff.get("orderes")); +// assertTrue(stuff.containsKey("payments")); +// assertTrue(stuff.containsKey("orders")); +// assertNull(stuff.get("orderes")); } } diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestMaps.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestMaps.java index 6b4cf0d3..ad47cef1 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestMaps.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestMaps.java @@ -2,10 +2,15 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestMaps extends BaseTest { + @Test public void testSimpleMap() throws Exception { ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestVersions.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestVersions.java index 2fcf6661..e280337a 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestVersions.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TestVersions.java @@ -1,12 +1,15 @@ package com.fasterxml.jackson.datatype.hibernate4; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.Versioned; -import com.fasterxml.jackson.datatype.hibernate4.Hibernate4Module; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestVersions extends BaseTest { + @Test public void testMapperVersions() { assertVersion(new Hibernate4Module()); @@ -15,7 +18,7 @@ public void testMapperVersions() private void assertVersion(Versioned vers) { Version v = vers.version(); - assertFalse("Should find version information (got "+v+")", v.isUnknownVersion()); + assertFalse(v.isUnknownVersion(), "Should find version information (got "+v+")"); // Version exp = PackageVersion.VERSION; // assertEquals(exp.toFullString(), v.toFullString()); // assertEquals(exp, v); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TransientTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TransientTest.java index 17530532..b45bd123 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TransientTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/TransientTest.java @@ -2,11 +2,15 @@ import javax.persistence.Transient; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Unit test for [#61] */ @@ -41,6 +45,7 @@ static class WithTransientAndView { /********************************************************************** */ + @Test public void testSimpleTransient() throws Exception { // First, with defaults, which allow use of Transient @@ -55,6 +60,7 @@ public void testSimpleTransient() throws Exception assertEquals(aposToQuotes("{'a':1,'b':2}"), mapper.writeValueAsString(new WithTransient())); } + @Test public void testTransientWithView() throws Exception { ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/UnwrappedTest.java b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/UnwrappedTest.java index da82f260..664e5a6e 100644 --- a/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/UnwrappedTest.java +++ b/hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/UnwrappedTest.java @@ -8,12 +8,15 @@ import com.fasterxml.jackson.datatype.hibernate4.data.Customer; import com.fasterxml.jackson.datatype.hibernate4.data.Product; import org.hibernate.Hibernate; +import org.junit.jupiter.api.Test; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; import java.util.Map; +import static org.junit.jupiter.api.Assertions.*; + /** * Unit test for [#97] */ @@ -36,6 +39,7 @@ public T getContent() } } + @Test public void testSimpleUnwrapped() throws JsonProcessingException { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/BaseTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/BaseTest.java index 95c3ba80..9224f75e 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/BaseTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/BaseTest.java @@ -6,7 +6,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -public abstract class BaseTest extends junit.framework.TestCase +import static org.junit.jupiter.api.Assertions.fail; + +public abstract class BaseTest { protected BaseTest() { try { diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ForceLazyLoadingTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ForceLazyLoadingTest.java index 13c80f73..08f82a00 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ForceLazyLoadingTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ForceLazyLoadingTest.java @@ -4,7 +4,8 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate5.jakarta.data.Customer; @@ -14,6 +15,8 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import static org.junit.jupiter.api.Assertions.*; + public class ForceLazyLoadingTest extends BaseTest { // [Issue#15] diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/HibernateTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/HibernateTest.java index b315c58a..ba9b9887 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/HibernateTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/HibernateTest.java @@ -1,8 +1,5 @@ package com.fasterxml.jackson.datatype.hibernate5.jakarta; -import org.junit.Assert; -import org.junit.Test; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate5.jakarta.data.Customer; import com.fasterxml.jackson.datatype.hibernate5.jakarta.data.Employee; @@ -12,16 +9,22 @@ import jakarta.persistence.Persistence; import jakarta.persistence.Query; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + public class HibernateTest extends BaseTest { protected EntityManagerFactory emf; - @Override + @BeforeEach public void setUp() { emf = Persistence.createEntityManagerFactory("persistenceUnit"); } - - @Override + + @AfterEach public void tearDown() { if (emf!=null) { emf.close(); @@ -37,7 +40,7 @@ public void tearDown() { @Test public void testGetEntityManager() { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); } @Test @@ -58,7 +61,7 @@ public void testGetCustomerJson() throws Exception { @Test public void testAllCustomersJson() throws Exception { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); Query query = em.createQuery("select c from Customer c"); // false -> no forcing of lazy loading @@ -85,8 +88,8 @@ public void testCyclesJson() throws Exception { EntityManager em = emf.createEntityManager(); Employee salesEmployee = em.find(Employee.class, 1370); - Assert.assertNotNull(salesEmployee); - Assert.assertTrue(salesEmployee.getCustomers().size()>0); + assertNotNull(salesEmployee); + assertTrue(salesEmployee.getCustomers().size()>0); // false -> no forcing of lazy loading ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/InclusionTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/InclusionTest.java index 4cf6bf98..d8ecce90 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/InclusionTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/InclusionTest.java @@ -2,9 +2,13 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class InclusionTest extends BaseTest { static class Mock @@ -14,6 +18,7 @@ static class Mock } // [hibernate#65] + @Test public void testInclusion() throws Exception { final ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/MissingEntitiesAsNullTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/MissingEntitiesAsNullTest.java index f9ad2437..c5c61ef6 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/MissingEntitiesAsNullTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/MissingEntitiesAsNullTest.java @@ -11,9 +11,13 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; // [Issue#125] public class MissingEntitiesAsNullTest extends BaseTest { + @Test public void testMissingProductWhenMissing() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -39,6 +43,7 @@ public void testMissingProductWhenMissing() throws Exception { } } + @Test public void testProductWithValidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -66,6 +71,7 @@ public void testProductWithValidForeignKey() throws Exception { // caused by jakarta.persistence.EntityNotFoundException: Unable to find // com.fasterxml.jackson.datatype.hibernate5.jakarta.data.Product with id X10_1678 + @Test public void testExceptionWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -90,6 +96,7 @@ public void testExceptionWithInvalidForeignKey() throws Exception { } } + @Test public void testWriteAsNullWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/OneToManyTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/OneToManyTest.java index 0e9ba30c..7bd42f52 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/OneToManyTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/OneToManyTest.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.persistence.OneToMany; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class OneToManyTest extends BaseTest { @@ -19,7 +22,8 @@ static final class X { static final class Y { public final Map m = new LinkedHashMap(); } - + + @Test public void testMap() throws Exception { Y object = new Y(); object.m.put("A", "A"); @@ -27,7 +31,8 @@ public void testMap() throws Exception { assertEquals(EXPECTED_JSON, mapWithoutHibernateModule(object)); assertEquals(EXPECTED_JSON, mapWithHibernateModule(object)); } - + + @Test public void testMapWithOneToMany() throws Exception { X object = new X(); object.m.put("A", "A"); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/Polymorphic81Test.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/Polymorphic81Test.java index 81e897b6..2d9ff09b 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/Polymorphic81Test.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/Polymorphic81Test.java @@ -3,11 +3,15 @@ import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class Polymorphic81Test extends BaseTest { static class TestLayout { @@ -62,6 +66,7 @@ public static Expression simpleFieldExpression(String field) { } } + @Test public void testPolymorphic81() throws Exception { final ObjectMapper mapper = mapperWithModule(true); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ReplacePersistentCollectionTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ReplacePersistentCollectionTest.java index 6dc7c55f..6fcaf8a3 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ReplacePersistentCollectionTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/ReplacePersistentCollectionTest.java @@ -3,10 +3,6 @@ import java.util.Set; import org.hibernate.Hibernate; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,21 +14,23 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import org.junit.jupiter.api.*; + +import static org.junit.jupiter.api.Assertions.*; + public class ReplacePersistentCollectionTest extends BaseTest { private EntityManagerFactory emf; private EntityManager em; - @Override - @Before + @BeforeEach public void setUp() throws Exception { emf = Persistence.createEntityManagerFactory("persistenceUnit"); em = emf.createEntityManager(); } - @After - @Override + @AfterEach public void tearDown() throws Exception { em.close(); emf.close(); @@ -47,12 +45,12 @@ public void testNoReplacePersistentCollection() throws Exception { ).enableDefaultTyping(DefaultTyping.NON_FINAL); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertTrue(json.contains("org.hibernate.collection")); + assertTrue(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); try { /*Customer result =*/ mapper.readValue(json, Customer.class); @@ -72,20 +70,20 @@ public void testReplacePersistentCollection() throws Exception { ).enableDefaultTyping(DefaultTyping.NON_FINAL); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertFalse(json.contains("org.hibernate.collection")); + assertFalse(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); Customer stuff = mapper.readValue(json, Customer.class); assertNotNull(stuff); // Map stuff = mapper.readValue(json, Map.class); // -// Assert.assertTrue(stuff.containsKey("payments")); -// Assert.assertTrue(stuff.containsKey("orders")); -// Assert.assertNull(stuff.get("orderes")); +// assertTrue(stuff.containsKey("payments")); +// assertTrue(stuff.containsKey("orders")); +// assertNull(stuff.get("orderes")); } } diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestMaps.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestMaps.java index 5ce6fdad..87450d3d 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestMaps.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestMaps.java @@ -3,10 +3,15 @@ import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestMaps extends BaseTest { + @Test public void testSimpleMap() throws Exception { ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestVersions.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestVersions.java index 493106eb..bb358b2f 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestVersions.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TestVersions.java @@ -1,10 +1,15 @@ package com.fasterxml.jackson.datatype.hibernate5.jakarta; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.Versioned; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestVersions extends BaseTest { + @Test public void testMapperVersions() { assertVersion(new Hibernate5JakartaModule()); @@ -13,7 +18,7 @@ public void testMapperVersions() private void assertVersion(Versioned vers) { Version v = vers.version(); - assertFalse("Should find version information (got "+v+")", v.isUnknownVersion()); + assertFalse(v.isUnknownVersion(), "Should find version information (got "+v+")"); // Version exp = PackageVersion.VERSION; // assertEquals(exp.toFullString(), v.toFullString()); // assertEquals(exp, v); diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TransientTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TransientTest.java index d433da43..715adc45 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TransientTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/TransientTest.java @@ -5,6 +5,10 @@ import jakarta.persistence.Transient; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Unit test for [#61] */ @@ -24,6 +28,7 @@ static class WithTransient { /********************************************************************** */ + @Test public void testSimpleTransient() throws Exception { // First, with defaults, which allow use of Transient diff --git a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/UnwrappedTest.java b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/UnwrappedTest.java index 711a710f..11be91f5 100644 --- a/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/UnwrappedTest.java +++ b/hibernate5-jakarta/src/test/java/com/fasterxml/jackson/datatype/hibernate5/jakarta/UnwrappedTest.java @@ -14,6 +14,10 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + /** * Unit test for [#97] */ @@ -36,6 +40,7 @@ public T getContent() } } + @Test public void testSimpleUnwrapped() throws JsonProcessingException { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/BaseTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/BaseTest.java index f9de1f87..52c8f0c2 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/BaseTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/BaseTest.java @@ -6,7 +6,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; -public abstract class BaseTest extends junit.framework.TestCase +import static org.junit.jupiter.api.Assertions.fail; + +public abstract class BaseTest { protected BaseTest() { try { diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ForceLazyLoadingTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ForceLazyLoadingTest.java index 3e2eb655..77b18b1f 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ForceLazyLoadingTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ForceLazyLoadingTest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.datatype.hibernate5.data.Customer; import com.fasterxml.jackson.datatype.hibernate5.data.Payment; import org.hibernate.Hibernate; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -12,6 +12,8 @@ import java.util.Map; import java.util.Set; +import static org.junit.jupiter.api.Assertions.*; + public class ForceLazyLoadingTest extends BaseTest { // [Issue#15] diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/HibernateTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/HibernateTest.java index 9dfd85a5..5e15d9ef 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/HibernateTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/HibernateTest.java @@ -6,22 +6,24 @@ import javax.persistence.Query; import com.fasterxml.jackson.datatype.hibernate5.data.Customer; -import org.junit.Assert; -import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate5.data.Employee; +import org.junit.jupiter.api.*; + +import static org.junit.jupiter.api.Assertions.*; + public class HibernateTest extends BaseTest { protected EntityManagerFactory emf; - @Override + @BeforeEach public void setUp() { emf = Persistence.createEntityManagerFactory("persistenceUnit"); } - - @Override + + @AfterEach public void tearDown() { if (emf!=null) { emf.close(); @@ -37,7 +39,7 @@ public void tearDown() { @Test public void testGetEntityManager() { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); } @Test @@ -58,7 +60,7 @@ public void testGetCustomerJson() throws Exception { @Test public void testAllCustomersJson() throws Exception { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); Query query = em.createQuery("select c from Customer c"); // false -> no forcing of lazy loading @@ -85,8 +87,8 @@ public void testCyclesJson() throws Exception { EntityManager em = emf.createEntityManager(); Employee salesEmployee = em.find(Employee.class, 1370); - Assert.assertNotNull(salesEmployee); - Assert.assertTrue(salesEmployee.getCustomers().size()>0); + assertNotNull(salesEmployee); + assertTrue(salesEmployee.getCustomers().size()>0); // false -> no forcing of lazy loading ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/InclusionTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/InclusionTest.java index 61813c41..77cf2d57 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/InclusionTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/InclusionTest.java @@ -2,9 +2,13 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class InclusionTest extends BaseTest { static class Mock @@ -14,6 +18,7 @@ static class Mock } // [hibernate#65] + @Test public void testInclusion() throws Exception { final ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/LazyLoadingTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/LazyLoadingTest.java index 0f8d1b0a..0e667f95 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/LazyLoadingTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/LazyLoadingTest.java @@ -13,7 +13,9 @@ import com.fasterxml.jackson.datatype.hibernate5.data.Payment; import org.hibernate.Hibernate; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class LazyLoadingTest extends BaseTest { diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/MissingEntitiesAsNullTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/MissingEntitiesAsNullTest.java index d8c76b90..58526160 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/MissingEntitiesAsNullTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/MissingEntitiesAsNullTest.java @@ -7,13 +7,17 @@ import javax.persistence.Persistence; import org.hibernate.Hibernate; +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.hibernate5.data.Customer; +import static org.junit.jupiter.api.Assertions.*; + // [Issue#125] public class MissingEntitiesAsNullTest extends BaseTest { + @Test public void testMissingProductWhenMissing() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -39,6 +43,7 @@ public void testMissingProductWhenMissing() throws Exception { } } + @Test public void testProductWithValidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -66,6 +71,7 @@ public void testProductWithValidForeignKey() throws Exception { // caused by javax.persistence.EntityNotFoundException: Unable to find // com.fasterxml.jackson.datatype.hibernate4.data.Product with id X10_1678 + @Test public void testExceptionWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -90,6 +96,7 @@ public void testExceptionWithInvalidForeignKey() throws Exception { } } + @Test public void testWriteAsNullWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/OneToManyTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/OneToManyTest.java index 91b37055..c2549828 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/OneToManyTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/OneToManyTest.java @@ -4,8 +4,12 @@ import javax.persistence.OneToMany; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class OneToManyTest extends BaseTest { static final String EXPECTED_JSON = "{\"m\":{\"A\":\"A\"}}"; @@ -18,7 +22,8 @@ static final class X { static final class Y { public final Map m = new LinkedHashMap(); } - + + @Test public void testMap() throws Exception { Y object = new Y(); object.m.put("A", "A"); @@ -26,7 +31,8 @@ public void testMap() throws Exception { assertEquals(EXPECTED_JSON, mapWithoutHibernateModule(object)); assertEquals(EXPECTED_JSON, mapWithHibernateModule(object)); } - + + @Test public void testMapWithOneToMany() throws Exception { X object = new X(); object.m.put("A", "A"); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/Polymorphic81Test.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/Polymorphic81Test.java index 0c070ed4..d3a7e18a 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/Polymorphic81Test.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/Polymorphic81Test.java @@ -2,9 +2,13 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class Polymorphic81Test extends BaseTest { static class TestLayout { @@ -59,6 +63,7 @@ public static Expression simpleFieldExpression(String field) { } } + @Test public void testPolymorphic81() throws Exception { final ObjectMapper mapper = mapperWithModule(true); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ReplacePersistentCollectionTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ReplacePersistentCollectionTest.java index 0454dc79..3a49175a 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ReplacePersistentCollectionTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/ReplacePersistentCollectionTest.java @@ -8,30 +8,28 @@ import com.fasterxml.jackson.datatype.hibernate5.data.Customer; import com.fasterxml.jackson.datatype.hibernate5.data.Payment; import org.hibernate.Hibernate; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.*; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; +import static org.junit.jupiter.api.Assertions.*; + public class ReplacePersistentCollectionTest extends BaseTest { private EntityManagerFactory emf; private EntityManager em; - @Override - @Before + @BeforeEach public void setUp() throws Exception { emf = Persistence.createEntityManagerFactory("persistenceUnit"); em = emf.createEntityManager(); } - @After - @Override + @AfterEach public void tearDown() throws Exception { em.close(); emf.close(); @@ -46,12 +44,12 @@ public void testNoReplacePersistentCollection() throws Exception { ).enableDefaultTyping(DefaultTyping.NON_FINAL); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertTrue(json.contains("org.hibernate.collection")); + assertTrue(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); try { /*Customer result =*/ mapper.readValue(json, Customer.class); @@ -71,20 +69,20 @@ public void testReplacePersistentCollection() throws Exception { ).enableDefaultTyping(DefaultTyping.NON_FINAL); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertFalse(json.contains("org.hibernate.collection")); + assertFalse(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); Customer stuff = mapper.readValue(json, Customer.class); assertNotNull(stuff); // Map stuff = mapper.readValue(json, Map.class); // -// Assert.assertTrue(stuff.containsKey("payments")); -// Assert.assertTrue(stuff.containsKey("orders")); -// Assert.assertNull(stuff.get("orderes")); +// assertTrue(stuff.containsKey("payments")); +// assertTrue(stuff.containsKey("orders")); +// assertNull(stuff.get("orderes")); } } diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestMaps.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestMaps.java index 5abe6cf9..0f670506 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestMaps.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestMaps.java @@ -2,10 +2,15 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestMaps extends BaseTest { + @Test public void testSimpleMap() throws Exception { ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestVersions.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestVersions.java index 45a0409e..17a68ea5 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestVersions.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TestVersions.java @@ -1,10 +1,15 @@ package com.fasterxml.jackson.datatype.hibernate5; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.Versioned; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestVersions extends BaseTest { + @Test public void testMapperVersions() { assertVersion(new Hibernate5Module()); @@ -13,7 +18,7 @@ public void testMapperVersions() private void assertVersion(Versioned vers) { Version v = vers.version(); - assertFalse("Should find version information (got "+v+")", v.isUnknownVersion()); + assertFalse(v.isUnknownVersion(), "Should find version information (got "+v+")"); // Version exp = PackageVersion.VERSION; // assertEquals(exp.toFullString(), v.toFullString()); // assertEquals(exp, v); diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TransientTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TransientTest.java index f30849ee..23fb0fb6 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TransientTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/TransientTest.java @@ -2,9 +2,13 @@ import javax.persistence.Transient; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Unit test for [#61] */ @@ -24,6 +28,7 @@ static class WithTransient { /********************************************************************** */ + @Test public void testSimpleTransient() throws Exception { // First, with defaults, which allow use of Transient diff --git a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/UnwrappedTest.java b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/UnwrappedTest.java index 68153ab8..266e997b 100644 --- a/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/UnwrappedTest.java +++ b/hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/UnwrappedTest.java @@ -8,11 +8,13 @@ import com.fasterxml.jackson.datatype.hibernate5.data.Customer; import com.fasterxml.jackson.datatype.hibernate5.data.Product; import org.hibernate.Hibernate; +import org.junit.jupiter.api.Test; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; -import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; /** * Unit test for [#97] @@ -36,6 +38,7 @@ public T getContent() } } + @Test public void testSimpleUnwrapped() throws JsonProcessingException { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/BaseTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/BaseTest.java index e4bc5dd2..2cb237d7 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/BaseTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/BaseTest.java @@ -6,7 +6,9 @@ import com.fasterxml.jackson.databind.json.JsonMapper; import org.apache.log4j.Logger; -public abstract class BaseTest extends junit.framework.TestCase +import static org.junit.jupiter.api.Assertions.fail; + +public abstract class BaseTest { protected BaseTest() { try { diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ForceLazyLoadingTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ForceLazyLoadingTest.java index 3e96b48c..fe0a4ea2 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ForceLazyLoadingTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ForceLazyLoadingTest.java @@ -3,16 +3,20 @@ import java.util.Map; import java.util.Set; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; + +import org.hibernate.Hibernate; + +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.datatype.hibernate6.data.Customer; import com.fasterxml.jackson.datatype.hibernate6.data.Payment; -import org.hibernate.Hibernate; -import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityManagerFactory; -import jakarta.persistence.Persistence; +import static org.junit.jupiter.api.Assertions.*; public class ForceLazyLoadingTest extends BaseTest { diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/HibernateTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/HibernateTest.java index 4edd9d02..a21d1909 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/HibernateTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/HibernateTest.java @@ -2,8 +2,6 @@ import com.fasterxml.jackson.datatype.hibernate6.data.Customer; import com.fasterxml.jackson.datatype.hibernate6.data.Employee; -import org.junit.Assert; -import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; @@ -12,16 +10,20 @@ import jakarta.persistence.Persistence; import jakarta.persistence.Query; +import org.junit.jupiter.api.*; + +import static org.junit.jupiter.api.Assertions.*; + public class HibernateTest extends BaseTest { protected EntityManagerFactory emf; - @Override + @BeforeEach public void setUp() { emf = Persistence.createEntityManagerFactory("persistenceUnit"); } - - @Override + + @AfterEach public void tearDown() { if (emf!=null) { emf.close(); @@ -37,7 +39,7 @@ public void tearDown() { @Test public void testGetEntityManager() { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); } @Test @@ -58,7 +60,7 @@ public void testGetCustomerJson() throws Exception { @Test public void testAllCustomersJson() throws Exception { EntityManager em = emf.createEntityManager(); - Assert.assertNotNull(em); + assertNotNull(em); Query query = em.createQuery("select c from Customer c"); // false -> no forcing of lazy loading @@ -85,8 +87,8 @@ public void testCyclesJson() throws Exception { EntityManager em = emf.createEntityManager(); Employee salesEmployee = em.find(Employee.class, 1370); - Assert.assertNotNull(salesEmployee); - Assert.assertTrue(salesEmployee.getCustomers().size()>0); + assertNotNull(salesEmployee); + assertTrue(salesEmployee.getCustomers().size()>0); // false -> no forcing of lazy loading ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/InclusionTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/InclusionTest.java index 59562543..14ec7f22 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/InclusionTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/InclusionTest.java @@ -2,9 +2,13 @@ import java.util.*; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class InclusionTest extends BaseTest { static class Mock @@ -14,6 +18,7 @@ static class Mock } // [hibernate#65] + @Test public void testInclusion() throws Exception { final ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/LazyLoadingTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/LazyLoadingTest.java index a0c15130..32913549 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/LazyLoadingTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/LazyLoadingTest.java @@ -6,7 +6,8 @@ import com.fasterxml.jackson.datatype.hibernate6.data.Customer; import com.fasterxml.jackson.datatype.hibernate6.data.Payment; import org.hibernate.Hibernate; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -16,6 +17,8 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import static org.junit.jupiter.api.Assertions.*; + public class LazyLoadingTest extends BaseTest { // For [#15] diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/MissingEntitiesAsNullTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/MissingEntitiesAsNullTest.java index 66a87f60..75669c44 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/MissingEntitiesAsNullTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/MissingEntitiesAsNullTest.java @@ -5,6 +5,8 @@ import com.fasterxml.jackson.datatype.hibernate6.data.Customer; import org.hibernate.Hibernate; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -12,8 +14,11 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import static org.junit.jupiter.api.Assertions.*; + // [Issue#125] public class MissingEntitiesAsNullTest extends BaseTest { + @Test public void testMissingProductWhenMissing() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -39,6 +44,7 @@ public void testMissingProductWhenMissing() throws Exception { } } + @Test public void testProductWithValidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -66,6 +72,7 @@ public void testProductWithValidForeignKey() throws Exception { // caused by jakarta.persistence.EntityNotFoundException: Unable to find // com.fasterxml.jackson.datatype.hibernate6.data.Product with id X10_1678 + @Test public void testExceptionWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); @@ -90,6 +97,7 @@ public void testExceptionWithInvalidForeignKey() throws Exception { } } + @Test public void testWriteAsNullWithInvalidForeignKey() throws Exception { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/OneToManyTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/OneToManyTest.java index 88aec70c..e9c71f16 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/OneToManyTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/OneToManyTest.java @@ -3,9 +3,13 @@ import java.util.LinkedHashMap; import java.util.Map; +import jakarta.persistence.OneToMany; + +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.persistence.OneToMany; +import static org.junit.jupiter.api.Assertions.assertEquals; public class OneToManyTest extends BaseTest { @@ -19,7 +23,8 @@ static final class X { static final class Y { public final Map m = new LinkedHashMap(); } - + + @Test public void testMap() throws Exception { Y object = new Y(); object.m.put("A", "A"); @@ -27,7 +32,8 @@ public void testMap() throws Exception { assertEquals(EXPECTED_JSON, mapWithoutHibernateModule(object)); assertEquals(EXPECTED_JSON, mapWithHibernateModule(object)); } - + + @Test public void testMapWithOneToMany() throws Exception { X object = new X(); object.m.put("A", "A"); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/Polymorphic81Test.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/Polymorphic81Test.java index 01aed5aa..71c3d0f5 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/Polymorphic81Test.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/Polymorphic81Test.java @@ -3,11 +3,15 @@ import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class Polymorphic81Test extends BaseTest { static class TestLayout { @@ -62,6 +66,7 @@ public static Expression simpleFieldExpression(String field) { } } + @Test public void testPolymorphic81() throws Exception { final ObjectMapper mapper = mapperWithModule(true); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ReplacePersistentCollectionTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ReplacePersistentCollectionTest.java index ac949a01..b4270d3f 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ReplacePersistentCollectionTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/ReplacePersistentCollectionTest.java @@ -5,10 +5,10 @@ import com.fasterxml.jackson.datatype.hibernate6.data.Customer; import com.fasterxml.jackson.datatype.hibernate6.data.Payment; import org.hibernate.Hibernate; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,21 +18,21 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import static org.junit.jupiter.api.Assertions.*; + public class ReplacePersistentCollectionTest extends BaseTest { private EntityManagerFactory emf; private EntityManager em; - @Override - @Before + @BeforeEach public void setUp() throws Exception { emf = Persistence.createEntityManagerFactory("persistenceUnit"); em = emf.createEntityManager(); } - @After - @Override + @AfterEach public void tearDown() throws Exception { em.close(); emf.close(); @@ -47,12 +47,12 @@ public void testNoReplacePersistentCollection() throws Exception { ).enableDefaultTyping(DefaultTyping.NON_FINAL); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertTrue(json.contains("org.hibernate.collection")); + assertTrue(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); try { /*Customer result =*/ mapper.readValue(json, Customer.class); @@ -72,20 +72,20 @@ public void testReplacePersistentCollection() throws Exception { ).enableDefaultTyping(DefaultTyping.NON_FINAL); Customer customer = em.find(Customer.class, 103); - Assert.assertFalse(Hibernate.isInitialized(customer.getPayments())); + assertFalse(Hibernate.isInitialized(customer.getPayments())); String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(customer); - Assert.assertFalse(json.contains("org.hibernate.collection")); + assertFalse(json.contains("org.hibernate.collection")); // should force loading... Set payments = customer.getPayments(); - Assert.assertTrue(Hibernate.isInitialized(payments)); + assertTrue(Hibernate.isInitialized(payments)); Customer stuff = mapper.readValue(json, Customer.class); assertNotNull(stuff); // Map stuff = mapper.readValue(json, Map.class); // -// Assert.assertTrue(stuff.containsKey("payments")); -// Assert.assertTrue(stuff.containsKey("orders")); -// Assert.assertNull(stuff.get("orderes")); +// assertTrue(stuff.containsKey("payments")); +// assertTrue(stuff.containsKey("orders")); +// assertNull(stuff.get("orderes")); } } diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestMaps.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestMaps.java index 329c6a31..fcd950aa 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestMaps.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestMaps.java @@ -3,10 +3,15 @@ import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class TestMaps extends BaseTest { + @Test public void testSimpleMap() throws Exception { ObjectMapper mapper = mapperWithModule(false); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestVersions.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestVersions.java index 0593d07d..bbbb0b82 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestVersions.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TestVersions.java @@ -1,10 +1,15 @@ package com.fasterxml.jackson.datatype.hibernate6; +import org.junit.jupiter.api.Test; + import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.Versioned; +import static org.junit.jupiter.api.Assertions.assertFalse; + public class TestVersions extends BaseTest { + @Test public void testMapperVersions() { assertVersion(new Hibernate6Module()); @@ -13,7 +18,7 @@ public void testMapperVersions() private void assertVersion(Versioned vers) { Version v = vers.version(); - assertFalse("Should find version information (got "+v+")", v.isUnknownVersion()); + assertFalse(v.isUnknownVersion(), "Should find version information (got "+v+")"); // Version exp = PackageVersion.VERSION; // assertEquals(exp.toFullString(), v.toFullString()); // assertEquals(exp, v); diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TransientTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TransientTest.java index 2aa5324a..e833c33d 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TransientTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/TransientTest.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.persistence.Transient; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Unit test for [#61] @@ -24,6 +27,7 @@ static class WithTransient { /********************************************************************** */ + @Test public void testSimpleTransient() throws Exception { // First, with defaults, which allow use of Transient diff --git a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/UnwrappedTest.java b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/UnwrappedTest.java index f69367f8..79797a87 100644 --- a/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/UnwrappedTest.java +++ b/hibernate6/src/test/java/com/fasterxml/jackson/datatype/hibernate6/UnwrappedTest.java @@ -13,6 +13,9 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Persistence; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; /** * Unit test for [#97] @@ -36,6 +39,7 @@ public T getContent() } } + @Test public void testSimpleUnwrapped() throws JsonProcessingException { EntityManagerFactory emf = Persistence.createEntityManagerFactory("persistenceUnit"); diff --git a/pom.xml b/pom.xml index 40e05e6a..ee4478e4 100644 --- a/pom.xml +++ b/pom.xml @@ -78,10 +78,20 @@ jackson-databind - + - junit - junit + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.assertj + assertj-core test