diff --git a/archetype/core-sample/pom.xml b/archetype/core-sample/pom.xml index affb9c2720..0c795e427c 100644 --- a/archetype/core-sample/pom.xml +++ b/archetype/core-sample/pom.xml @@ -17,7 +17,7 @@ blaze-persistence-archetype-core-sample jar - Blazebit Persistence Archetype Core Sample Jakarta + Blazebit Persistence Archetype Core Sample com.blazebit.persistence.archetype.core.sample diff --git a/archetype/entity-view-sample/pom.xml b/archetype/entity-view-sample/pom.xml index 209a92e5c9..53000bbb1c 100644 --- a/archetype/entity-view-sample/pom.xml +++ b/archetype/entity-view-sample/pom.xml @@ -17,7 +17,7 @@ blaze-persistence-archetype-entity-view-sample jar - Blazebit Persistence Archetype Entity-View Sample Jakarta + Blazebit Persistence Archetype Entity-View Sample com.blazebit.persistence.archetype.view.sample diff --git a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java index 20366b4ecc..676934fd2b 100644 --- a/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java +++ b/core/impl/src/main/java/com/blazebit/persistence/impl/query/ModificationQuerySpecification.java @@ -107,7 +107,12 @@ protected void initialize() { affectedDmlTable = sqlQuery.substring(fromIndex + SqlUtils.FROM.length(), endIndex == -1 ? sqlQuery.length() : endIndex); } else if (statementType == DbmsStatementType.INSERT) { int intoIndex = sqlQuery.indexOf(" into "); - affectedDmlTable = sqlQuery.substring(intoIndex + " into ".length(), sqlQuery.indexOf('(', intoIndex + " into ".length() + 1)); + int intoEndIndex = sqlQuery.indexOf('(', intoIndex + " into ".length() + 1); + affectedDmlTable = sqlQuery.substring(intoIndex + " into ".length(), intoEndIndex); + int asIndex = affectedDmlTable.indexOf(" as "); + if (asIndex != -1) { + affectedDmlTable = affectedDmlTable.substring(0, asIndex); + } } else { throw new UnsupportedOperationException("Unsupported statement type: " + statementType); } diff --git a/core/testsuite-hibernate/pom.xml b/core/testsuite-hibernate/pom.xml index 7e65699317..9197e9d580 100644 --- a/core/testsuite-hibernate/pom.xml +++ b/core/testsuite-hibernate/pom.xml @@ -68,7 +68,7 @@ ${maven.test.skip} ${surefireForkCount} ${project.build.directory}/surefire-reports/${surefire.forkNumber} - com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest,${jpa.excludedGroups} + com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups} jdbc:h2:mem:core${surefire.forkNumber};DB_CLOSE_DELAY=-1 admin @@ -327,7 +327,7 @@ hibernate-6.2 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 @@ -420,6 +420,10 @@ org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + -AaddGeneratedAnnotation=false + @@ -428,7 +432,7 @@ hibernate-6.4 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64 @@ -532,7 +536,7 @@ true - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java index ed4a44672a..0ff56e05fe 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/CustomFunctionTest.java @@ -6,15 +6,7 @@ package com.blazebit.persistence.testsuite.hibernate; -import com.blazebit.persistence.spi.CriteriaBuilderConfiguration; -import com.blazebit.persistence.spi.JpqlFunctionGroup; -import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL; +import java.util.Properties; import org.hibernate.boot.model.FunctionContributions; import org.hibernate.dialect.H2Dialect; @@ -26,9 +18,16 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import com.blazebit.persistence.spi.CriteriaBuilderConfiguration; +import com.blazebit.persistence.spi.JpqlFunctionGroup; +import com.blazebit.persistence.testsuite.AbstractCoreTest; +import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; +import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; +import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; +import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; +import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import java.util.Properties; /** * @author Jan-Willem Gmelig Meyling @@ -48,7 +47,7 @@ public static class BasicEntity { } @Test - @Category({NoMSSQL.class, NoMySQL.class, NoMySQLOld.class, NoPostgreSQL.class, NoOracle.class, NoDB2.class}) + @Category({NoMSSQL.class, NoMySQL.class, NoPostgreSQL.class, NoOracle.class, NoDB2.class}) public void implicitJoinCustomAggregateFunction() { String queryString = cbf.create(em, BasicEntity.class, "b") .select("addone(b.id)") diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java index 2f9543176b..7d2ccca3a6 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/DereferenceManyToOneAssociationInJoinedInheritanceHierarchyTest.java @@ -7,16 +7,9 @@ import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53; import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; import jakarta.persistence.Column; import jakarta.persistence.ConstraintMode; @@ -71,10 +64,6 @@ public void setUp() { } @Test - @Category({ - // Although unused, this test dependent on the availability of group join support introduced in Hibernate 5.2.8 - NoHibernate42.class, NoHibernate43.class, NoHibernate51.class - }) public void testRootTypeJoinWithGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -113,10 +102,6 @@ public void testRootTypeJoinWithGroupJoins() { } @Test - @Category({ - NoHibernate50.class, NoHibernate43.class, NoHibernate42.class, // Entity join required for fallback - NoHibernate52.class, NoHibernate53.class // Optimize with group joins instead - }) public void testRootTypeJoinWithoutGroupJoins() { Assume.assumeFalse(supportsTableGroupJoins()); @@ -169,10 +154,6 @@ public void testRootTypeJoinWithoutGroupJoins() { } @Test - @Category({ - // This test requires group joins introduced in Hibernate 5.2.8 - NoHibernate42.class, NoHibernate43.class, NoHibernate51.class - }) public void testSubTypeJoinWithTableGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -211,10 +192,6 @@ public void testSubTypeJoinWithTableGroupJoins() { } @Test - @Category({ - NoHibernate50.class, NoHibernate43.class, NoHibernate42.class, // Entity join required for fallback - NoHibernate52.class, NoHibernate53.class // Optimize with group joins instead - }) public void testSubTypeJoinWithoutTableGroupJoins() { Assume.assumeFalse(supportsTableGroupJoins()); Assume.assumeTrue(jpaProvider.supportsEntityJoin()); diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java index b4c6153d2d..13562287d9 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/EnversTest.java @@ -5,14 +5,16 @@ package com.blazebit.persistence.testsuite.hibernate; -import com.blazebit.persistence.parser.EntityMetamodel; -import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.hibernate.envers.Audited; + import org.junit.Test; -import org.junit.experimental.categories.Category; +import com.blazebit.persistence.parser.EntityMetamodel; +import com.blazebit.persistence.testsuite.AbstractCoreTest; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; @@ -20,10 +22,6 @@ import jakarta.persistence.Table; import jakarta.persistence.metamodel.EntityType; -import java.util.List; -import java.util.Map; -import java.util.Set; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -39,10 +37,7 @@ protected Class[] getEntityClasses() { return new Class[]{ A.class }; } - // NOTE: Hibernate 4.2 and 4.3 do very strange things to the JPA entity name and also register the audited entities only via the FQN + _AUD - // At some point we might fix that in the JoinManager to output compatible HQL, but for now, we just ignore it @Test - @Category({ NoHibernate42.class, NoHibernate43.class }) public void selectEnversEntity() { EntityMetamodel metamodel = cbf.getService(EntityMetamodel.class); EntityType auditedEntity = getAuditedEntity(metamodel, A.class); diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java index 33ac193a71..f1efa29584 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/FullJoinTest.java @@ -5,29 +5,25 @@ package com.blazebit.persistence.testsuite.hibernate; +import java.util.List; + +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.JoinType; import com.blazebit.persistence.PaginatedCriteriaBuilder; import com.blazebit.persistence.testsuite.AbstractCoreTest; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.Tuple; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -39,7 +35,7 @@ * @author Jan-Willem Gmelig Meyling * @since 1.4.0 */ -@Category({NoH2.class, NoMySQL.class, NoMySQLOld.class, NoHibernate.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class}) +@Category({NoH2.class, NoMySQL.class}) public class FullJoinTest extends AbstractCoreTest { @Before diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java index 719a825d38..09434975ac 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1000Test.java @@ -5,16 +5,12 @@ package com.blazebit.persistence.testsuite.hibernate; +import org.junit.Test; + import com.blazebit.persistence.CTE; import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; import com.blazebit.persistence.testsuite.entity.LongSequenceEntity; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; @@ -45,9 +41,6 @@ public static class CorrelatedTimer extends LongSequenceEntity {} public static class Timer extends LongSequenceEntity {} @Test - @Category({ - NoHibernate50.class, NoHibernate43.class, NoHibernate42.class, // Entity join required for fallback - }) public void testCorrelation() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java index ec23c17d8d..257a1a7377 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue1704Test.java @@ -5,20 +5,18 @@ package com.blazebit.persistence.testsuite.hibernate; -import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.hibernate.annotations.Where; + import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; +import com.blazebit.persistence.CriteriaBuilder; +import com.blazebit.persistence.testsuite.AbstractCoreTest; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; import jakarta.persistence.FetchType; @@ -26,9 +24,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Tuple; -import java.util.HashSet; -import java.util.List; -import java.util.Set; /** * @author Christian Beikov @@ -43,10 +38,7 @@ protected Class[] getEntityClasses() { }; } - // NOTE: Old MySQL do not support lateral joins - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink @Test - @Category({ NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class }) public void testLateralLimit() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java index 9c118de51e..4af1e58006 100644 --- a/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java +++ b/core/testsuite-hibernate/src/test/java/com/blazebit/persistence/testsuite/hibernate/Issue950Test.java @@ -7,12 +7,6 @@ import com.blazebit.persistence.testsuite.AbstractCoreTest; import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import org.junit.Before; import org.junit.Test; @@ -165,9 +159,7 @@ public void work(EntityManager em) { }); } - // NOTE: Requires Entity joins @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testJoinOrderWithRightJoin() { transactional(new TxVoidWork() { @Override @@ -207,7 +199,7 @@ public void work(EntityManager em) { // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class }) + @Category({ NoHibernate.class }) public void testJoinOrderWithRightNormalJoin() { transactional(new TxVoidWork() { @Override @@ -245,9 +237,7 @@ public void work(EntityManager em) { }); } - // NOTE: Requires Entity joins @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testJoinOrderWithRightJoinWithIdDereference() { transactional(new TxVoidWork() { @Override @@ -296,7 +286,7 @@ public void work(EntityManager em) { // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class }) + @Category({ NoHibernate.class }) public void testJoinOrderWithRightNormalJoinWithIdDereference() { transactional(new TxVoidWork() { @Override @@ -343,9 +333,7 @@ public void work(EntityManager em) { }); } - // NOTE: Requires Entity joins @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testJoinOrderWithRightJoinWithInnerImplicitJoins() { transactional(new TxVoidWork() { @Override @@ -394,7 +382,7 @@ public void work(EntityManager em) { // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class }) + @Category({ NoHibernate.class }) public void testJoinOrderWithRightNormalJoinWithInnerImplicitJoins() { transactional(new TxVoidWork() { @Override @@ -441,9 +429,7 @@ public void work(EntityManager em) { }); } - // NOTE: Requires Entity joins @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testJoinOrderWithRightJoinWithNonOptionalAssociationProjections() { transactional(new TxVoidWork() { @Override @@ -487,7 +473,7 @@ public void work(EntityManager em) { // NOTE: Hibernate currently doesn't fully respect the join order, but just renders association joins first @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoHibernate.class }) + @Category({ NoHibernate.class }) public void testJoinOrderWithRightNormalJoinWithNonOptionalAssociationProjections() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/pom.xml b/core/testsuite/pom.xml index e9acff334a..a4b3b64ed7 100644 --- a/core/testsuite/pom.xml +++ b/core/testsuite/pom.xml @@ -173,7 +173,7 @@ admin admin org.h2.Driver - com.blazebit.persistence.testsuite.base.jpa.category.NoH2,com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest,${jpa.excludedGroups} + com.blazebit.persistence.testsuite.base.jpa.category.NoH2,${jpa.excludedGroups} ${testBasePackage} ${surefireForkCount} $${surefire.forkNumber} @@ -427,7 +427,7 @@ hibernate-6.2 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 src/main/hibernate @@ -521,6 +521,10 @@ org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + -AaddGeneratedAnnotation=false + @@ -529,7 +533,7 @@ hibernate-6.4 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64 src/main/hibernate @@ -634,7 +638,7 @@ true - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 src/main/hibernate diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java index a05776bbf2..4fd213ee73 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AdvancedQueryCachingTest.java @@ -5,15 +5,14 @@ package com.blazebit.persistence.testsuite; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.entity.Document; +import java.util.Arrays; +import java.util.Collection; + import org.junit.Test; import org.junit.experimental.categories.Category; -import java.util.Arrays; -import java.util.Collection; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.entity.Document; /** * @author Christian Beikov @@ -29,7 +28,7 @@ public class AdvancedQueryCachingTest extends AbstractCoreTest { */ @Test // NOTE: This uses advanced SQL that isn't supported for other JPA providers yet - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void differentParameterListSizesShouldNotResultInQueryCacheHit() { toUpperDocumentNames(Arrays.asList(1L)); toUpperDocumentNames(Arrays.asList(1L, 2L)); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java index e2048e7908..1b9a6e63fb 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/AliasBasedMapKeyDereferencingTest.java @@ -6,12 +6,7 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -42,7 +37,7 @@ protected Class[] getEntityClasses() { } @Test - @Category({NoDatanucleus.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class}) + @Category({NoEclipselink.class}) public void test() { CriteriaBuilder crit = cbf.create(em, RootEntity.class, "root") .innerJoin("container", "container_1") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java index 52284f330d..adacbe4e6d 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ArrayExpressionTest.java @@ -7,14 +7,7 @@ import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.parser.expression.ArrayExpression; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import org.junit.Test; @@ -237,9 +230,7 @@ public void testPredicateIndexReuseBase() { criteria.getResultList(); } - // NOTE: Older Hibernate versions don't like the IS NULL predicate when applied to an association in the ON clause @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus4.class }) public void testNewImplicitRoot() { CriteriaBuilder criteria = cbf.create(em, Person.class).from(Document.class, "d"); criteria.select("d.contacts[friend IS NULL]"); @@ -251,8 +242,6 @@ public void testNewImplicitRoot() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class }) public void testEntityArray() { CriteriaBuilder criteria = cbf.create(em, Person.class).from(Document.class, "d"); criteria.select("Person[name = d.name]"); @@ -264,8 +253,6 @@ public void testEntityArray() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class }) public void testEntityArrayReuse() { CriteriaBuilder criteria = cbf.create(em, Tuple.class).from(Document.class, "d"); criteria.select("Person[name = d.name].id"); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java index f73f1e8398..5ef116a2d4 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEEntityInheritanceCheckTest.java @@ -5,15 +5,12 @@ package com.blazebit.persistence.testsuite; -import com.blazebit.persistence.CTE; -import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; +import com.blazebit.persistence.CTE; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.PersistenceException; @@ -22,7 +19,7 @@ * @author Moritz Becker * @since 1.4.0 */ -@Category({NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class CTEEntityInheritanceCheckTest extends AbstractCoreTest { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java index 9fea8b5e7f..0745b97eef 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTEQueryResultCachingTest.java @@ -5,23 +5,22 @@ package com.blazebit.persistence.testsuite; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.Properties; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.RecursiveEntity; import com.blazebit.persistence.testsuite.entity.TestCTE; import com.blazebit.persistence.testsuite.entity.Version; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.TypedQuery; -import java.util.Properties; /** * @author Jan-Willem Gmelig Meyling @@ -60,7 +59,7 @@ public final void tearDown() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class }) + @Category({ NoEclipselink.class, NoMySQL.class }) public void cteQueryResultCachingTest() { TypedQuery query = cbf.create(em, TestCTE.class).with(TestCTE.class) .from(RecursiveEntity.class, "e") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java index 9c25b79f23..fe7b995723 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CTETest.java @@ -5,30 +5,28 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.FullSelectCTECriteriaBuilder; import com.blazebit.persistence.LeafOngoingSetOperationCTECriteriaBuilder; import com.blazebit.persistence.PagedList; import com.blazebit.persistence.PaginatedCriteriaBuilder; import com.blazebit.persistence.impl.BuilderChainingException; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.RecursiveEntity; import com.blazebit.persistence.testsuite.entity.TestAdvancedCTE1; import com.blazebit.persistence.testsuite.entity.TestAdvancedCTE2; import com.blazebit.persistence.testsuite.entity.TestCTE; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -73,7 +71,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testBindingNull() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE1.class, "t").where("t.level").ltExpression("2"); cb.with(TestAdvancedCTE1.class, false) @@ -89,7 +87,7 @@ public void testBindingNull() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testNotFullyBoundCTE() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t"); FullSelectCTECriteriaBuilder> fullSelectCTECriteriaBuilder = cb.with(TestCTE.class, false) @@ -103,7 +101,7 @@ public void testNotFullyBoundCTE() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testNotFullyBoundCTEOnSetOperation() { CriteriaBuilder cb = cbf.create(em, TestCTE.class); FullSelectCTECriteriaBuilder> builder = cb.with(TestCTE.class, false) @@ -115,7 +113,7 @@ public void testNotFullyBoundCTEOnSetOperation() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testNotFullyBoundCTEOnSecondSetOperation() { CriteriaBuilder cb = cbf.create(em, TestCTE.class); LeafOngoingSetOperationCTECriteriaBuilder> builder = cb.with(TestCTE.class, false) @@ -134,7 +132,7 @@ public void testNotFullyBoundCTEOnSecondSetOperation() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testNotDefinedCTE() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t"); @@ -144,7 +142,7 @@ public void testNotDefinedCTE() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testCTE() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2"); cb.with(TestCTE.class, false) @@ -167,7 +165,7 @@ public void testCTE() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testCTEAdvanced() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE1.class, "t").where("t.level").ltExpression("2"); cb.with(TestAdvancedCTE1.class, false) @@ -196,7 +194,7 @@ public void testCTEAdvanced() { // NOTE: Apparently H2 doesn't like limit in CTEs @Test - @Category({ NoH2.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testCTELimit() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t"); cb.with(TestCTE.class, false) @@ -222,7 +220,7 @@ public void testCTELimit() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testRecursiveCTE() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2"); cb.withRecursive(TestCTE.class) @@ -256,7 +254,7 @@ public void testRecursiveCTE() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testPaginationWithRecursiveCte() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class).orderByAsc("id"); // The CTE doesn't really matter, it's just there to trigger #570 @@ -283,7 +281,7 @@ public void testPaginationWithRecursiveCte() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testRecursiveCTEAdvanced() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE1.class, "t").where("t.level").ltExpression("2"); cb.withRecursive(TestAdvancedCTE1.class) @@ -325,7 +323,7 @@ public void testRecursiveCTEAdvanced() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testRecursiveCTEPagination() { CriteriaBuilder cb = cbf.create(em, TestCTE.class); cb.withRecursive(TestCTE.class) @@ -397,7 +395,7 @@ public void testRecursiveCTEPagination() { // NOTE: Apparently H2 before 1.4.199 produces wrong results when a CTE is used with IN predicate // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testRecursiveCTEPaginationIdQuery() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.withRecursive(TestCTE.class) @@ -495,7 +493,7 @@ public void testRecursiveCTEPaginationIdQuery() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testRecursiveCTEPaginationIdQueryLeftJoin() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.withRecursive(TestCTE.class) @@ -588,7 +586,7 @@ public void testRecursiveCTEPaginationIdQueryLeftJoin() { // NOTE: Apparently H2 before 1.4.199 can't handle multiple CTEs @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testCTEInSubquery() { CriteriaBuilder cb = cbf.create(em, String.class) .from(RecursiveEntity.class, "r") @@ -619,7 +617,7 @@ public void testCTEInSubquery() { // NOTE: Apparently H2 can't handle multiple CTEs @Test - @Category({ NoH2.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testBindEmbeddable() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE2.class); cb.with(TestAdvancedCTE1.class, false) @@ -659,7 +657,7 @@ public void testBindEmbeddable() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testBindEmbeddableWithNullBindingsForJoinableAttributes() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE1.class); cb.with(TestAdvancedCTE1.class, false) @@ -693,7 +691,7 @@ public void testBindEmbeddableWithNullBindingsForJoinableAttributes() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testWithStartSetEmptyRightSide() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE1.class); cb.withStartSet(TestAdvancedCTE1.class, false) @@ -718,7 +716,7 @@ public void testWithStartSetEmptyRightSide() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testWithStartSetEmptyRightSideLeaf() { CriteriaBuilder cb = cbf.create(em, TestAdvancedCTE1.class); cb.withStartSet(TestAdvancedCTE1.class, false) @@ -745,7 +743,7 @@ public void testWithStartSetEmptyRightSideLeaf() { @Test // NOTE: H2 does not support the PARTITION clause in the ROW_NUMBER function, so we can't emulate EXCEPT ALL - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQL.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testWithStartSetEmptyLeftSideLeaf() { CriteriaBuilder cb = cbf.create(em, TestCTE.class) .withStartSet(TestCTE.class, false) @@ -774,7 +772,7 @@ public void testWithStartSetEmptyLeftSideLeaf() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testBuilderEndTracking() { FullSelectCTECriteriaBuilder> cb = cbf.create(em, TestCTE.class).with(TestCTE.class, false); cb.from(RecursiveEntity.class, "e") @@ -793,7 +791,7 @@ public void testBuilderEndTracking() { // from issue #513 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testNestedSizeInCte() { CriteriaBuilder cb = cbf.create(em, Long.class) .with(TestCTE.class, false) @@ -815,7 +813,7 @@ public void testNestedSizeInCte() { // For issue #1563 @Test // NOTE: MySQL doesn't support nesting set operands i.e. `q1 union (q2 union q3)` is illegal, but `q1 union q2 union q3` is fine. Let's ignore that for now - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class }) + @Category({ NoEclipselink.class, NoMySQL.class }) public void testInlineInSetOperand() { CriteriaBuilder cb = cbf.create(em, Object[].class); cb.with(TestAdvancedCTE1.class, true) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java index c9e26c9a11..013c06e1be 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionJoinTest.java @@ -6,13 +6,8 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.*; import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; @@ -91,8 +86,6 @@ public void testManyToManyJoinTableDuplicateName() { } @Test - // NOTE: http://hibernate.atlassian.net/browse/HHH-10229 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) public void testElementCollection() { CriteriaBuilder criteria = cbf.create(em, Object[].class); criteria.from(Root.class, "r"); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java index b39b39df54..4e3dcf80ad 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleDeleteTest.java @@ -5,13 +5,15 @@ package com.blazebit.persistence.testsuite; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.DeleteCriteriaBuilder; import com.blazebit.persistence.ReturningResult; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable; import com.blazebit.persistence.testsuite.entity.IndexedNode; import com.blazebit.persistence.testsuite.entity.KeyedEmbeddable; @@ -25,16 +27,10 @@ import com.blazebit.persistence.testsuite.entity.Sub2Sub1; import com.blazebit.persistence.testsuite.entity.Sub2Sub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * @@ -42,7 +38,7 @@ * @since 1.2.0 */ // NOTE: No advanced sql support for datanucleus, eclipselink and openjpa yet -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoEclipselink.class }) public class CollectionRoleDeleteTest extends AbstractCoreTest { @Before @@ -126,7 +122,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void deleteIndexedImplicitJoin() { DeleteCriteriaBuilder criteria = cbf.deleteCollection(em, Root.class, "r", "indexedNodes"); criteria.where("r.name").eq("r"); @@ -143,7 +139,7 @@ public void deleteIndexedImplicitJoin() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void deleteIndexedMultipleDeepImplicitJoin() { DeleteCriteriaBuilder criteria = cbf.deleteCollection(em, Root.class, "r", "indexedNodes"); criteria.where("r.name").eq("r"); @@ -164,7 +160,7 @@ public void deleteIndexedMultipleDeepImplicitJoin() { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void deleteIndexedReturning() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java index e49155d444..b0a804d5a4 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInsertTest.java @@ -5,13 +5,17 @@ package com.blazebit.persistence.testsuite; +import java.util.Collections; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.InsertCriteriaBuilder; import com.blazebit.persistence.ReturningResult; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable; import com.blazebit.persistence.testsuite.entity.IndexedNode; @@ -26,15 +30,9 @@ import com.blazebit.persistence.testsuite.entity.Sub2Sub1; import com.blazebit.persistence.testsuite.entity.Sub2Sub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.Collections; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -44,7 +42,7 @@ * @since 1.2.0 */ // NOTE: No advanced sql support for datanucleus, eclipselink and openjpa yet -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoEclipselink.class }) public class CollectionRoleInsertTest extends AbstractCoreTest { private static final Integer I2_ID = 4; @@ -185,7 +183,7 @@ public void work(EntityManager em) { // NOTE: Oracle doesn't support the RETURNING clause for INSERT .. SELECT statements, only for INSERT .. VALUES // https://stackoverflow.com/questions/5325033/plsql-insert-into-with-subquery-and-returning-clause-oracle @Test - @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoEclipselink.class }) public void insertIndexedReturning() { transactional(new TxVoidWork() { @Override @@ -446,7 +444,7 @@ public void work(EntityManager em) { // NOTE: Oracle doesn't support the RETURNING clause for INSERT .. SELECT statements, only for INSERT .. VALUES // https://stackoverflow.com/questions/5325033/plsql-insert-into-with-subquery-and-returning-clause-oracle @Test - @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoOracle.class, NoEclipselink.class }) public void insertIndexedReturningWithParams() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java index 2c874ed2b7..4d5bdcc6cd 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleInverseDeleteTest.java @@ -5,38 +5,37 @@ package com.blazebit.persistence.testsuite; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.DeleteCriteriaBuilder; import com.blazebit.persistence.ReturningObjectBuilder; import com.blazebit.persistence.ReturningResult; import com.blazebit.persistence.SimpleReturningBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -82,7 +81,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testSimple() { transactional(new TxVoidWork() { @Override @@ -108,7 +107,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningAll() { transactional(new TxVoidWork() { @Override @@ -136,7 +135,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningAllObjectBuilder() { transactional(new TxVoidWork() { @Override @@ -181,7 +180,7 @@ public List buildList(List list) { @Test // NOTE: No returning support yet for collection DML for inverse deletes @Ignore - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningLast() { transactional(new TxVoidWork() { @Override @@ -209,7 +208,7 @@ public void work(EntityManager em) { @Test // NOTE: No returning support yet for collection DML for inverse deletes @Ignore - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testDeleteReturningSelectOld() { transactional(new TxVoidWork() { @Override @@ -250,7 +249,7 @@ public void work(EntityManager em) { @Test // NOTE: No returning support yet for collection DML for inverse deletes @Ignore - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testDeleteReturningSelectNew() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java index 1bbd7e2eac..45b081aff2 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CollectionRoleUpdateTest.java @@ -5,16 +5,17 @@ package com.blazebit.persistence.testsuite; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.ReturningResult; import com.blazebit.persistence.UpdateCriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.IndexedEmbeddable; import com.blazebit.persistence.testsuite.entity.IndexedNode; @@ -30,11 +31,6 @@ import com.blazebit.persistence.testsuite.entity.Sub2Sub1; import com.blazebit.persistence.testsuite.entity.Sub2Sub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; @@ -47,7 +43,7 @@ * @since 1.2.0 */ // NOTE: No advanced sql support for datanucleus, eclipselink and openjpa yet -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoEclipselink.class }) public class CollectionRoleUpdateTest extends AbstractCoreTest { private static final Integer I2_ID = 4; @@ -156,7 +152,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void updateIndexedImplicitJoin() { transactional(new TxVoidWork() { @Override @@ -186,7 +182,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void updateIndexedMultipleDeepImplicitJoin() { transactional(new TxVoidWork() { @Override @@ -222,7 +218,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys // NOTE: DB2 and Oracle do not support FROM FINAL TABLE or RETURNING with MERGE. Fix this with https://github.com/Blazebit/blaze-persistence/issues/1137 @Test - @Category({ NoH2.class, NoMySQL.class, NoDB2.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoDB2.class, NoOracle.class, NoEclipselink.class }) public void updateIndexedReturning() { transactional(new TxVoidWork() { @Override @@ -460,9 +456,8 @@ public void work(EntityManager em) { }); } - // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals... @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class }) + @Category({NoEclipselink.class}) public void updateKeyedWithInlineCte() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java index 0fbf19fc95..7bb205f3ed 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/CountQueryTest.java @@ -5,17 +5,15 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.impl.function.alias.AliasFunction; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; @@ -130,7 +128,7 @@ public void countQueryWithGroupBy() { // NOTE: This requires advanced SQL support @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void countQueryWithGroupByAndLimit() { CriteriaBuilder crit = cbf.create(em, Long.class) .from(Document.class, "d") @@ -150,7 +148,7 @@ public void countQueryWithGroupByAndLimit() { // NOTE: This requires advanced SQL support @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void countQueryFromHavingQuery() { CriteriaBuilder crit = cbf.create(em, Document.class, "d"); crit.select("d.id") @@ -186,7 +184,7 @@ public void countQueryWithDistinct() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void boundedCountQueryFromSimpleQuery() { CriteriaBuilder crit = cbf.create(em, Document.class, "d"); @@ -201,7 +199,7 @@ public void boundedCountQueryFromSimpleQuery() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void boundedCountQueryFromCollectionJoinQuery() { CriteriaBuilder crit = cbf.create(em, Tuple.class) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java index 0737cb36cc..70daa63833 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DateTruncTest.java @@ -6,7 +6,7 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoH2Latest; +import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Version; @@ -243,7 +243,7 @@ public void testDateTruncSecond() { // NOTE: H2 2.0 changed the meaning of "week" to be locale sensitive: https://github.com/h2database/h2database/issues/3922 @Test - @Category({ NoH2Latest.class }) + @Category({ NoH2.class }) public void testDateTruncWeek() { CriteriaBuilder criteria = cbf.create(em, Tuple.class) .from(Document.class, "doc") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java index e36a5938fa..9ab0c289b5 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeletePolymorphicTest.java @@ -5,19 +5,21 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.DeleteCriteriaBuilder; import com.blazebit.persistence.ReturningResult; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.PolymorphicBase; @@ -28,17 +30,11 @@ import com.blazebit.persistence.testsuite.entity.PolymorphicSub2; import com.blazebit.persistence.testsuite.entity.StringIdCTE; import com.blazebit.persistence.testsuite.entity.TPCBase; -import com.blazebit.persistence.testsuite.entity.TPCSub2; import com.blazebit.persistence.testsuite.entity.TPCSub1; +import com.blazebit.persistence.testsuite.entity.TPCSub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -168,9 +164,8 @@ public void work(EntityManager em) { } @Test - // NOTE: MySQL does not support CTEs // NOTE: H2 only supports with clause in select statement - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testTablePerClassWithCte() { transactional(new TxVoidWork() { @Override @@ -201,9 +196,8 @@ public void work(EntityManager em) { } @Test - // NOTE: MySQL does not support CTEs // NOTE: H2 only supports with clause in select statement - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testJoinedWithCte() { transactional(new TxVoidWork() { @Override @@ -234,9 +228,8 @@ public void work(EntityManager em) { } @Test - // NOTE: MySQL does not support CTEs // NOTE: H2 only supports with clause in select statement - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testSingleTableWithCte() { transactional(new TxVoidWork() { @Override @@ -268,7 +261,7 @@ public void work(EntityManager em) { @Test // NOTE: H2 and MySQL only support returning generated keys - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturning() { transactional(new TxVoidWork() { @Override @@ -290,7 +283,7 @@ public void work(EntityManager em) { @Test // NOTE: H2 and MySQL only support returning generated keys - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturning() { transactional(new TxVoidWork() { @Override @@ -312,7 +305,7 @@ public void work(EntityManager em) { @Test // NOTE: H2 and MySQL only support returning generated keys - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturning() { transactional(new TxVoidWork() { @Override @@ -334,7 +327,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturningInCTE() { transactional(new TxVoidWork() { @Override @@ -366,7 +359,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturningInCTE() { transactional(new TxVoidWork() { @Override @@ -398,7 +391,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturningInCTE() { transactional(new TxVoidWork() { @Override @@ -434,7 +427,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturningInCTESelectOld() { transactional(new TxVoidWork() { @Override @@ -468,7 +461,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturningInCTESelectOld() { transactional(new TxVoidWork() { @Override @@ -502,7 +495,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturningInCTESelectOld() { transactional(new TxVoidWork() { @Override @@ -537,7 +530,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturningInCTESelectNew() { transactional(new TxVoidWork() { @Override @@ -576,7 +569,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturningInCTESelectNew() { transactional(new TxVoidWork() { @Override @@ -615,7 +608,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturningInCTESelectNew() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java index 17b39a676b..af256fb99d 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/DeleteTest.java @@ -5,10 +5,6 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -16,31 +12,29 @@ import java.util.Set; import java.util.TreeSet; -import jakarta.persistence.EntityManager; - -import com.blazebit.persistence.ReturningObjectBuilder; -import com.blazebit.persistence.SimpleReturningBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.DeleteCriteriaBuilder; +import com.blazebit.persistence.ReturningObjectBuilder; import com.blazebit.persistence.ReturningResult; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import com.blazebit.persistence.SimpleReturningBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; +import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import jakarta.persistence.EntityManager; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -171,7 +165,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningAll() { transactional(new TxVoidWork() { @Override @@ -194,7 +188,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningAllObjectBuilder() { transactional(new TxVoidWork() { @Override @@ -232,7 +226,7 @@ public List buildList(List list) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningLast() { transactional(new TxVoidWork() { @Override @@ -254,7 +248,7 @@ public void work(EntityManager em) { // NOTE: H2 only supports with clause in select statement // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningLastWithCte() { transactional(new TxVoidWork() { @Override @@ -286,9 +280,8 @@ public void work(EntityManager em) { } // NOTE: H2 only supports with clause in select statement - // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testSimpleWithCte() { transactional(new TxVoidWork() { @Override @@ -318,7 +311,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testDeleteReturningSelectOld() { transactional(new TxVoidWork() { @Override @@ -352,7 +345,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testDeleteReturningSelectNew() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java index a2eb02d736..443bf79618 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableComplexTest.java @@ -7,15 +7,10 @@ import static org.junit.Assert.assertEquals; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import jakarta.persistence.Tuple; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.*; import org.junit.Assert; import org.junit.Test; @@ -23,7 +18,6 @@ import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; /** * This kind of mapping is not required to be supported by a JPA implementation. @@ -32,8 +26,7 @@ * @since 1.0.6 */ // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062 -// TODO: report that datanucleus doesn't support element collection in an embeddable -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({NoEclipselink.class}) public class EmbeddableComplexTest extends AbstractCoreTest { @Override @@ -124,8 +117,6 @@ public void testWhereEmbeddableElementCollectionPropertyFilter() { } @Test - // NOTE: http://hibernate.atlassian.net/browse/HHH-10229 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) public void testSelectEmbeddableElementCollection() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(EmbeddableTestEntity.class, "e") .select("embeddable.elementCollection"); @@ -136,8 +127,6 @@ public void testSelectEmbeddableElementCollection() { } @Test - // NOTE: http://hibernate.atlassian.net/browse/HHH-10229 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) public void testSelectEmbeddableElementCollectionArraySyntax() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(EmbeddableTestEntity.class, "e") .select("embeddable.elementCollection['test']"); @@ -148,8 +137,6 @@ public void testSelectEmbeddableElementCollectionArraySyntax() { } @Test - // NOTE: http://hibernate.atlassian.net/browse/HHH-10229 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) public void testSelectEmbeddableElementCollectionArraySyntaxValue() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(EmbeddableTestEntity.class, "e") .select("embeddable.elementCollection['test'].primaryName"); @@ -177,7 +164,7 @@ public void testSelectEmbeddableFetchElementCollection() { @Test // Test for #598 // NOTE: Hibernate 6.0 supports this now - @Category(NoHibernate60.class) + @Category(NoHibernate.class) public void testSelectEmbeddableFetchElementCollectionJpaOnly() { try { em.createQuery("SELECT e.embeddable FROM EmbeddableTestEntity e JOIN FETCH e.embeddable.elementCollection2").getResultList(); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java index d483782595..9b2c0336b3 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EmbeddableSimpleTest.java @@ -5,22 +5,16 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.Order; import com.blazebit.persistence.testsuite.entity.OrderPosition; import com.blazebit.persistence.testsuite.entity.OrderPositionElement; import com.blazebit.persistence.testsuite.entity.OrderPositionHead; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.Tuple; import static org.junit.Assert.assertEquals; @@ -86,8 +80,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testCyclicDependencyInOnClauseImplicitJoin2() { CriteriaBuilder criteria = cbf.create(em, OrderPosition.class, "p"); criteria.leftJoinDefaultOn("p.order", "o") @@ -97,8 +89,7 @@ public void testCyclicDependencyInOnClauseImplicitJoin2() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testCyclicDependencyInOnClauseImplicitJoin3() { CriteriaBuilder criteria = cbf.create(em, OrderPosition.class, "p"); criteria.leftJoinDefaultOn("p.order", "o") @@ -108,9 +99,7 @@ public void testCyclicDependencyInOnClauseImplicitJoin3() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - // NOTE: DataNucleus 4 does not seem to support TYPE(x) IN (..) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus4.class }) + @Category({ NoEclipselink.class }) public void testCyclicDependencyInOnClauseImplicitJoin4() { CriteriaBuilder criteria = cbf.create(em, OrderPosition.class, "p"); criteria.leftJoinDefaultOn("p.order", "o") @@ -120,8 +109,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin4() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testCyclicDependencyInOnClauseImplicitJoin5() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefaultOn("o.orderPositions", "p") @@ -131,8 +118,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin5() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) public void testCyclicDependencyInOnClauseImplicitJoin6() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefaultOn("o.orderPositions", "p") @@ -142,8 +127,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin6() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class }) public void testCyclicDependencyInOnClauseImplicitJoin7() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefault("o.orderPositions", "p") @@ -160,8 +143,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin7() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class }) public void testCyclicDependencyInOnClauseImplicitJoin8() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefault("o.orderPositions", "p") @@ -179,8 +160,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin8() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class }) public void testCyclicDependencyInOnClauseImplicitJoin9() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefault("o.orderPositions", "p") @@ -199,8 +178,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin9() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class }) public void testCyclicDependencyInOnClauseImplicitJoin10() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefaultOn("o.orderPositions", "p") @@ -220,8 +197,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin10() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class }) public void testCyclicDependencyInOnClauseImplicitJoin11() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefaultOn("o.orderPositions", "p") @@ -242,8 +217,6 @@ public void testCyclicDependencyInOnClauseImplicitJoin11() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class }) public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefaultOn("o.orderPositions", "p") @@ -266,8 +239,7 @@ public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction2() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefaultOn("o.orderPositions", "p") @@ -299,8 +271,7 @@ public void testCyclicDependencyInOnClauseImplicitJoinInDisjunction2() { } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testImplicitJoinSingularAttributeInOnClause() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefault("o.orderPositions", "p") @@ -337,8 +308,7 @@ public void testImplicitJoinSingularAttributeInOnClause() { // } @Test - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSingleValueAssociationIdAccessInOnClause() { CriteriaBuilder criteria = cbf.create(em, Order.class, "o"); criteria.leftJoinDefault("o.orderPositions", "p") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java index 0ab80e1772..c4ca9d3f3d 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityGeneralTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -32,8 +31,6 @@ public void neverRewriteEntityAssociationEqualsEntityInWhere() { } @Test - // NOTE: Datanucleus does not support transient objects as parameters - @Category({ NoDatanucleus.class }) public void neverRewriteEntityAssociationEqualsTransientEntityParameterInWhere() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); criteria.where("d.owner").eq(new Person(1L)); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java index 5dd72e5781..98daaaf046 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityNoRewriteToIdTest.java @@ -5,18 +5,13 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; @@ -26,7 +21,6 @@ * @author Christian Beikov * @since 1.2.0 */ -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) public class EntityEqualityNoRewriteToIdTest extends AbstractCoreTest { @Test @@ -42,7 +36,6 @@ public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported() { } @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus4.class }) public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported1() { CriteriaBuilder criteria = cbf.create(em, Person.class, "p"); criteria.innerJoinOn(Document.class,"correlated_ownedDocuments") @@ -56,7 +49,6 @@ public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported1() { } @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus4.class }) public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported2() { CriteriaBuilder criteria = cbf.create(em, Person.class, "p"); criteria.select("correlated_ownedDocuments.owner.name"); @@ -71,8 +63,6 @@ public void neverRewriteEntityAssociationEqualsEntityInOnIfSupported2() { } @Test - // NOTE: Datanucleus does not support transient objects as parameters - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class }) public void neverRewriteEntityAssociationEqualsTransientEntityParameterInOnIfSupported() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); criteria.innerJoinOn("partners","p") @@ -86,7 +76,7 @@ public void neverRewriteEntityAssociationEqualsTransientEntityParameterInOnIfSup @Test // NOTE: Eclipselink loads entities when doing getReference() - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void neverRewriteEntityAssociationEqualsManagedEntityParameterInOnIfSupported() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); criteria.innerJoinOn("partners","p") @@ -111,8 +101,6 @@ public void neverRewriteEntityEqualsEntityAssociationInOnIfSupported() { } @Test - // NOTE: Datanucleus does not support transient objects as parameters - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class }) public void neverRewriteEntityEqualsTransientEntityParameterInOn() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); criteria.innerJoinOn("partners","p") @@ -126,7 +114,7 @@ public void neverRewriteEntityEqualsTransientEntityParameterInOn() { @Test // NOTE: Eclipselink loads entities when doing getReference() - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void neverRewriteEntityEqualsManagedEntityParameterInOn() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); criteria.innerJoinOn("partners","p") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityRewriteToIdTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityRewriteToIdTest.java deleted file mode 100644 index c5287b6167..0000000000 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityEqualityRewriteToIdTest.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite; - -import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.Person; -import org.junit.Assume; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import static org.junit.Assert.assertEquals; - -/** - * Test that asserts Hibernate versions which can't handle entity comparisons do id rewrites. - * - * @author Christian Beikov - * @since 1.2.0 - */ -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) -public class EntityEqualityRewriteToIdTest extends AbstractCoreTest { - - @Test - // This actually only makes sense for Hibernate 5.1 - public void rewriteEntityAssociationEqualsEntityInOnToIdEquals() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 1); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p.partnerDocument").eqExpression("d") - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p.partnerDocument.id = d.id"), criteria.getQueryString()); - criteria.getResultList(); - } - - @Test - // Pre Hibernate 5.1 we could do this broken thing to make some stuff work - public void rewriteEntityAssociationEqualsEntityInOnToIdEqualsBroken() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 0); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p.partnerDocument").eqExpression("d") - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p.partnerDocument.id = d"), criteria.getQueryString()); - criteria.getResultList(); - } - - @Test - // Pre Hibernate 5.1 we could do this broken thing to make some stuff work - public void rewriteEntityAssociationEqualsParameterInOnToIdEquals() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() <= 1); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p.partnerDocument").eq(new Document(1L)) - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p.partnerDocument.id = :param_0"), criteria.getQueryString()); - criteria.getResultList(); - } - - @Test - // This actually only makes sense for Hibernate 5.1 - public void rewriteEntityEqualsEntityAssociationInOnToIdEquals() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 1); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p").eqExpression("d.owner") - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p.id = d.owner.id"), criteria.getQueryString()); - criteria.getResultList(); - } - - @Test - // Pre Hibernate 5.1 we could do this broken thing to make some stuff work - public void rewriteEntityEqualsEntityAssociationInOnToIdEqualsBroken() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 0); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p").eqExpression("d.owner") - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p = d.owner.id"), criteria.getQueryString()); - criteria.getResultList(); - } - - @Test - // This actually only makes sense for Hibernate 5.1 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate52.class, NoHibernate53.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) - public void rewriteEntityEqualsTransientEntityParameterInOn() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 1); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p").eq(new Person(1L)) - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p.id = :param_0"), criteria.getQueryString()); - criteria.getResultList(); - } - - @Test - // Pre Hibernate 5.1 we could do this broken thing to make some stuff work - public void rewriteEntityEqualsTransientEntityParameterInOnBroken() { - Assume.assumeTrue(getJpaProviderFamily() == JpaProviderFamily.HIBERNATE && getJpaProviderMajorVersion() < 5 || getJpaProviderMajorVersion() == 5 && getJpaProviderMinorVersion() == 0); - CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); - criteria.innerJoinOn("partners","p") - .on("p").eq(new Person(1L)) - .end(); - - assertEquals("SELECT d FROM Document d JOIN d.partners p" - + onClause("p = :param_0"), criteria.getQueryString()); - criteria.getResultList(); - } - -} diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java index 176a0ddbd6..5bada47193 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityInValuesClauseTest.java @@ -5,24 +5,23 @@ package com.blazebit.persistence.testsuite; +import java.util.Arrays; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentTupleEntity; import com.blazebit.persistence.testsuite.entity.EmbeddedDocumentTupleEntity; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; import jakarta.persistence.TypedQuery; -import java.util.Arrays; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -75,7 +74,7 @@ public void setUp() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void entityClassWithMultipleRelationsInValuesClause() { CriteriaBuilder cb = cbf.create(em, Tuple.class); @@ -96,7 +95,7 @@ public void entityClassWithMultipleRelationsInValuesClause() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void entityClassWithEmbeddedIdInValuesClause() { CriteriaBuilder cb = cbf.create(em, Tuple.class); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java index f7dc7e0133..2e381e80c0 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityJoinTest.java @@ -5,21 +5,16 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -29,8 +24,6 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class}) public class EntityJoinTest extends AbstractCoreTest { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java index e38ca6e56f..cac794526c 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByEmbeddableTest.java @@ -6,29 +6,9 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; -import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.IntIdEntity; -import com.blazebit.persistence.testsuite.entity.Order; -import com.blazebit.persistence.testsuite.entity.OrderPosition; -import com.blazebit.persistence.testsuite.entity.OrderPositionElement; -import com.blazebit.persistence.testsuite.entity.OrderPositionHead; -import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.SimpleEmbeddedIdEntity; import com.blazebit.persistence.testsuite.entity.SimpleEmbeddedIdEntityId; -import com.blazebit.persistence.testsuite.entity.Version; -import com.blazebit.persistence.testsuite.entity.Workflow; import org.junit.Test; -import org.junit.experimental.categories.Category; import jakarta.persistence.Tuple; diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java index b136bc1a2a..e2566bf214 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/GroupByTest.java @@ -5,22 +5,20 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.Tuple; import static org.junit.Assert.assertEquals; @@ -32,9 +30,7 @@ */ public class GroupByTest extends AbstractCoreTest { - // Datanucleus does not support grouping by a byte[] as it seems @Test - @Category({ NoDatanucleus.class }) public void testGroupByEntitySelect() { CriteriaBuilder criteria = cbf.create(em, Long.class).from(Document.class, "d"); criteria.groupBy("d.owner"); @@ -62,7 +58,7 @@ public void testSizeTransformWithImplicitParameterGroupBy1() { // This is a MySQL only test @Test - @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoH2.class, NoMSSQL.class, NoEclipselink.class}) + @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoH2.class, NoMSSQL.class, NoEclipselink.class}) public void testImplicitGroupByFunctionExpression() { CriteriaBuilder criteria = cbf.create(em, Long.class).from(Document.class, "d") .select("CAST_DATE(FUNCTION('date', '2000-01-01'))") @@ -96,7 +92,9 @@ public void testOmitGroupByLiteral() { cb.getResultList(); } + // NOTE: Hibernate ORM doesn't detect that it has to use the join alias column @Test + @Category({ NoHibernate.class }) public void testGroupBySubqueryCorrelatedExpression() { CriteriaBuilder cb = cbf.create(em, Tuple.class) .from(Document.class, "d") @@ -143,8 +141,6 @@ public void testGroupByElementCollectionKey() { } @Test - // DataNucleus4 apparently can't handle join of associations within element collections - @Category({ NoDatanucleus4.class }) public void testGroupByElementCollectionValue() { CriteriaBuilder cb = cbf.create(em, Long.class) .from(Document.class, "d") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java index 338f08c612..5f01c207bd 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/IdClassValueQueryTest.java @@ -5,19 +5,18 @@ package com.blazebit.persistence.testsuite; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.IdClassEntity; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; -import java.util.ArrayList; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -57,7 +56,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValueQuery() { IdClassEntity e1 = new IdClassEntity(1,"1", 1); IdClassEntity e2 = new IdClassEntity(2,"2", 2); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java index ef5c369c8b..da4448e194 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InTest.java @@ -5,21 +5,18 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; import org.junit.Test; -import org.junit.experimental.categories.Category; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.entity.Document; +import static org.junit.Assert.assertEquals; + /** * * @author Christian Beikov @@ -29,8 +26,6 @@ public class InTest extends AbstractCoreTest { @Test - // NOTE: See https://hibernate.atlassian.net/browse/HHH-9630 - @Category({ NoHibernate42.class, NoHibernate43.class }) public void testBuggyHqlIn() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); List indicies = Arrays.asList(new Integer[]{ 1, 2, 3, 4, 5 }); @@ -46,8 +41,6 @@ public void testBuggyHqlIn() { } @Test - // NOTE: See https://hibernate.atlassian.net/browse/HHH-9630 - @Category({ NoHibernate42.class, NoHibernate43.class }) public void testBuggyHqlIn1() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); List indicies = Arrays.asList(new Integer[]{ 1, 2, 3, 4, 5 }); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java index 73f67062d9..fde2141390 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InlineCTETest.java @@ -5,17 +5,16 @@ package com.blazebit.persistence.testsuite; +import java.util.Collections; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentCTE; @@ -31,14 +30,7 @@ import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.testsuite.entity.Workflow; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.Collections; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -100,10 +92,8 @@ public void work(EntityManager em) { }); } - // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals... - // Prior to Hibernate 5.1 it wasn't possible reference other from clause elements in the ON clause which is required to support implicit joins in ON clauses @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testInliningFromSubqueryCte() { cbf.create(em, RecursiveEntity.class) .withRecursive(DocumentCTE.class) @@ -136,7 +126,7 @@ public void testInliningFromSubqueryCte() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testReusedNestedCte() { CriteriaBuilder cteBuilder = cbf.create(em, ParameterOrderEntity.class) .withRecursive(TestCTE.class) @@ -218,7 +208,7 @@ public void testReusedNestedCte() { // TODO: Oracle requires a cycle clause #295 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testReusedNestedCte2() { CriteriaBuilder cteBuilder = cbf.create(em, ParameterOrderCte.class) .withRecursive(TestCTE.class) @@ -273,9 +263,8 @@ public void testReusedNestedCte2() { cteBuilder.getResultList(); } - // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals... @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class }) + @Category({ NoEclipselink.class }) public void testParameterBindingOrder() { CriteriaBuilder cteBuilder = cbf.create(em, ParameterOrderEntity.class) .with(ParameterOrderCte.class) @@ -301,9 +290,8 @@ public void testParameterBindingOrder() { Assert.assertEquals(1, resultList.size()); } - // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals... @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class }) + @Category({ NoEclipselink.class }) public void testParameterBindingOrderPaginated() { CriteriaBuilder cteBuilder = cbf.create(em, ParameterOrderEntity.class) .with(ParameterOrderCte.class) @@ -331,7 +319,7 @@ public void testParameterBindingOrderPaginated() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testParameterBindingOrderNested() { CriteriaBuilder cteBuilder = cbf.create(em, ParameterOrderEntity.class) .with(ParameterOrderCte.class) @@ -362,9 +350,8 @@ public void testParameterBindingOrderNested() { Assert.assertEquals(1, resultList.size()); } - // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals... @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class }) + @Category({ NoEclipselink.class }) public void testParameterBindingOrderNestedPaginated() { CriteriaBuilder cteBuilder = cbf.create(em, ParameterOrderEntity.class) .with(ParameterOrderCte.class) @@ -400,7 +387,7 @@ public void testParameterBindingOrderNestedPaginated() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testInlineCTE() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2"); cb.with(TestCTE.class, true) @@ -421,7 +408,7 @@ public void testInlineCTE() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testInlineCTENullExpression() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2"); cb.with(TestCTE.class, true) @@ -441,7 +428,7 @@ public void testInlineCTENullExpression() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testInlineCTEWithParam() { CriteriaBuilder cb = cbf.create(em, TestCTE.class, "t").where("t.level").ltExpression("2"); cb.with(TestCTE.class, true) @@ -460,9 +447,8 @@ public void testInlineCTEWithParam() { assertEquals(2, resultList.size()); } - // NOTE: Hibernate 4.2 and 4.3 interprets entity name tokens in string literals... @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class }) + @Category({ NoEclipselink.class }) public void testInlineCTEInCorrelatedSubquery() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class, "r") .whereExists() @@ -486,7 +472,7 @@ public void testInlineCTEInCorrelatedSubquery() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testInlineEntityWithLimit() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .fromEntitySubquery(RecursiveEntity.class, "t") @@ -505,7 +491,7 @@ public void testInlineEntityWithLimit() { // Test for #1285 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testJoinOnSubquery() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .from(RecursiveEntity.class, "t") @@ -528,10 +514,8 @@ public void testJoinOnSubquery() { assertEquals(1, resultList.size()); } - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // NOTE: Hibernate 5.1 renders t.id = tSub.id rather than t = tSub @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class}) + @Category({ NoEclipselink.class }) public void testMultipleInlineEntityWithLimitJoin() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .fromEntitySubquery(RecursiveEntity.class, "t") @@ -563,9 +547,8 @@ public void testMultipleInlineEntityWithLimitJoin() { assertEquals(1, resultList.size()); } - // NOTE: Entity joins are only supported on Hibernate 5.1+ @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class }) public void testJoinInlineEntityWithLimit() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .fromValues(RecursiveEntity.class, "name", "val", Collections.singletonList("child1_1")) @@ -586,10 +569,9 @@ public void testJoinInlineEntityWithLimit() { assertEquals(1, resultList.size()); } - // NOTE: H2 and old MySQL do not support lateral joins - // NOTE: Entity joins are only supported on Hibernate 5.1+ + // NOTE: H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinLateralEntityWithLimit() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .fromValues(RecursiveEntity.class, "name", "val", Collections.singletonList("child1_1")) @@ -611,10 +593,9 @@ public void testJoinLateralEntityWithLimit() { assertEquals(1, resultList.size()); } - // NOTE: H2 and old MySQL do not support lateral joins - // NOTE: Entity joins are only supported on Hibernate 5.1+ + // NOTE: H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinLateralCorrelationEntityWithLimit() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .from(RecursiveEntity.class, "x") @@ -626,7 +607,7 @@ public void testJoinLateralCorrelationEntityWithLimit() { .on("1").eqExpression("1") .end() .select("t"); - String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM RecursiveEntity r WHERE r.parent.id = x.id ORDER BY r.name ASC LIMIT 1"; + String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM x.children r ORDER BY r.name ASC LIMIT 1"; String expected = "" + "SELECT t FROM RecursiveEntity x LEFT JOIN LATERAL RecursiveEntity(" + expectedSubquery + ") t(id, name, parent.id)" + onClause("1 = 1") + " WHERE x.name = :param_0"; @@ -635,10 +616,9 @@ public void testJoinLateralCorrelationEntityWithLimit() { assertEquals(1, resultList.size()); } - // NOTE: H2 and old MySQL do not support lateral joins - // NOTE: Entity joins are only supported on Hibernate 5.1+ + // NOTE: H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinLateralCorrelationEntityJoinTableWithLimit() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .from(RecursiveEntity.class, "x") @@ -660,10 +640,9 @@ public void testJoinLateralCorrelationEntityJoinTableWithLimit() { } // Test for #1193 - // NOTE: H2 and old MySQL do not support lateral joins - // NOTE: Entity joins are only supported on Hibernate 5.1+ + // NOTE: H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinLateralWithArrayExpressionImplicitJoin() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .from(RecursiveEntity.class, "x") @@ -680,19 +659,16 @@ public void testJoinLateralWithArrayExpressionImplicitJoin() { } // Additional test for #1193 - // NOTE: H2 and old MySQL do not support lateral joins - // NOTE: Entity joins are only supported on Hibernate 5.1+ + // NOTE: H2 does not support lateral joins @Test -// @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) - // NOTE: This requires joins to be ordered correctly which is only fixed in Hibernate 5.4.22+. Also see https://hibernate.atlassian.net/browse/HHH-14201 - @Ignore + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinLateralWithElementArrayExpressionImplicitJoin() { CriteriaBuilder cb = cbf.create(em, RecursiveEntity.class) .from(RecursiveEntity.class, "x") .leftJoinLateralEntitySubquery("x.children[name = x.parent.name]", "t", "r").end() .where("x.name").eq("root1") .select("t"); - String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM RecursiveEntity x_children_base, RecursiveEntity x_parent_base LEFT JOIN x_parent_base.parent parent_1 JOIN x_children_base.children r ON (r.name = parent_1.name) WHERE x.id = x_children_base.id AND x.id = x_parent_base.id"; + String expectedSubquery = "SELECT r.id, r.name, r.parent.id FROM RecursiveEntity x_children_base CROSS JOIN RecursiveEntity x_parent_base LEFT JOIN x_parent_base.parent parent_1 JOIN x_children_base.children r ON (r.name = parent_1.name) WHERE x.id = x_children_base.id AND x.id = x_parent_base.id"; String expected = "" + "SELECT t FROM RecursiveEntity x LEFT JOIN LATERAL RecursiveEntity(" + expectedSubquery + ") t(id, name, parent.id)" + onClause("1 = 1") + " WHERE x.name = :param_0"; diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java index 62da29d2e4..3ffab7ced3 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/InsertTest.java @@ -5,14 +5,8 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - import java.util.List; -import jakarta.persistence.EntityManager; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.tx.TxWork; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -20,22 +14,21 @@ import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.InsertCriteriaBuilder; import com.blazebit.persistence.ReturningResult; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; +import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.entity.DeletePersonCTE; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.PersonCTE; import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import com.blazebit.persistence.testsuite.tx.TxWork; +import jakarta.persistence.EntityManager; + +import static org.junit.Assert.assertEquals; /** * @@ -74,7 +67,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testSimple() { transactional(new TxVoidWork() { @Override @@ -98,7 +91,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testSimpleWithLimit() { transactional(new TxVoidWork() { @Override @@ -123,7 +116,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testSimpleWithLimitAndOffset() { transactional(new TxVoidWork() { @Override @@ -148,9 +141,8 @@ public void work(EntityManager em) { }); } - // NOTE: hibernate 4.2 does not support using parameters in the select clause @Test - @Category({ NoHibernate42.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testSimpleWithParameters() { transactional(new TxVoidWork() { @Override @@ -177,7 +169,7 @@ public void work(EntityManager em) { // NOTE: H2 does not support returning all generated keys @Test - @Category({ NoH2.class, NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoEclipselink.class }) public void testReturningAll() { ReturningResult result = transactional(new TxWork>() { @Override @@ -206,7 +198,7 @@ public ReturningResult work(EntityManager em) { } @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testReturningLast() { ReturningResult result = transactional(new TxWork>() { @Override @@ -233,7 +225,7 @@ public ReturningResult work(EntityManager em) { } @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testReturningLastWithParameter() { ReturningResult result = transactional(new TxWork>() { @Override @@ -262,7 +254,7 @@ public ReturningResult work(EntityManager em) { // TODO: This does not work with sequences for H2 because the next value of the sequence is evaluated regardless of the limit @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testReturningLastWithLimit() { ReturningResult result = transactional(new TxWork>() { @Override @@ -290,9 +282,8 @@ public ReturningResult work(EntityManager em) { } // NOTE: H2 and MySQL only support returning generated keys - // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoOracle.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoEclipselink.class }) public void testReturningLastWithCte() { ReturningResult result = transactional(new TxWork>() { @Override @@ -331,9 +322,8 @@ public ReturningResult work(EntityManager em) { } // NOTE: H2 and MySQL only support returning generated keys - // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoOracle.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoEclipselink.class }) public void testReturningLastWithCteAndLimit() { ReturningResult result = transactional(new TxWork>() { @Override @@ -372,9 +362,8 @@ public ReturningResult work(EntityManager em) { } // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE - // NOTE: hibernate 4.2 does not support using parameters in the select clause @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testDeleteReturningWithCteAndLimitInto() { ReturningResult result = transactional(new TxWork>() { @Override @@ -414,9 +403,8 @@ public ReturningResult work(EntityManager em) { } // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE - // NOTE: hibernate 4.2 does not support using parameters in the select clause @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testInsertReturningSelectOld() { transactional(new TxVoidWork() { @Override @@ -455,9 +443,8 @@ public void work(EntityManager em) { } // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE - // NOTE: hibernate 4.2 does not support using parameters in the select clause @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testInsertReturningSelectNew() { transactional(new TxVoidWork() { @Override @@ -495,9 +482,8 @@ public void work(EntityManager em) { } // Test for #1737 - // NOTE: hibernate 4.2 does not support using parameters in the select clause @Test - @Category({ NoOracle.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class }) + @Category({ NoOracle.class, NoEclipselink.class }) public void testAssociationParameter() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java index 3f67dcb693..fdcabb80ef 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue1114Test.java @@ -4,11 +4,15 @@ */ package com.blazebit.persistence.testsuite; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.HashSet; +import java.util.List; +import java.util.function.Function; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.DeletePersonCTE; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IntIdEntity; @@ -17,13 +21,7 @@ import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.testsuite.entity.Workflow; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.HashSet; -import java.util.List; -import java.util.function.Function; import static org.junit.Assert.assertEquals; @@ -81,7 +79,7 @@ public void work(EntityManager em) { // Test for issue #1114 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoH2.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testLimitedCteWithoutLimitInMainQueryButWithCollectionFetch() { Function> fetchPersonBatch = batch -> cbf.create(em, Person.class) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java index 815e80f936..1f9577be9f 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/Issue571Test.java @@ -5,26 +5,23 @@ package com.blazebit.persistence.testsuite; +import java.io.Serializable; +import java.util.Objects; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.ExpectedException; + import com.blazebit.persistence.CTE; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.impl.query.CustomSQLTypedQuery; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.IdClassEntity; import com.blazebit.persistence.testsuite.entity.IdClassEntityId; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.ExpectedException; - import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; import jakarta.persistence.GeneratedValue; @@ -32,8 +29,6 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.ManyToOne; -import java.io.Serializable; -import java.util.Objects; import static org.junit.Assert.assertEquals; @@ -64,8 +59,8 @@ public void work(EntityManager em) { } @Test - // Ignore MySQL / Oracle because of unsupported use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class }) + // Ignore MySQL / Oracle because of unsupported use of CTE's + @Category({ NoEclipselink.class, NoOracle.class }) public void testBindingCteAssociationToEntity() { transactional(new TxVoidWork() { @Override @@ -104,8 +99,8 @@ public void work(EntityManager em) { } @Test - // Ignore MySQL / Oracle because of unsuppored use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class }) + // Ignore MySQL / Oracle because of unsuppored use of CTE's + @Category({ NoEclipselink.class, NoOracle.class }) public void testBindingCteAssociationToEntityId() { expectedException.expectMessage("An association should be bound to its association type and not its identifier type"); @@ -148,7 +143,7 @@ public void work(EntityManager em) { @Test // Ignore MySQL / Oracle because of unsuppored use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class }) + @Category({ NoEclipselink.class, NoOracle.class }) public void testBindingCteAssociationIdToEntityId() { transactional(new TxVoidWork() { @Override @@ -188,8 +183,8 @@ public void work(EntityManager em) { } @Test - // Ignore MySQL / Oracle because of unsupported use of CTE's, ignore Hibernate 4.3 and 4.3 metamodel bug - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoOracle.class, NoHibernate42.class, NoHibernate43.class }) + // Ignore MySQL / Oracle because of unsupported use of CTE's + @Category({ NoEclipselink.class, NoOracle.class }) public void testBindingCteUsingNestedIdClass() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java index 2dbc5c2aed..60387d9b0d 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinOnTest.java @@ -5,21 +5,15 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - -import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.blazebit.persistence.CriteriaBuilder; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; -import org.junit.experimental.categories.Category; + +import static org.junit.Assert.assertEquals; /** * @@ -125,7 +119,6 @@ public void testLeftJoinOnSubquery() { } @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class}) public void testJoinAvoidance() { CriteriaBuilder crit = cbf.create(em, String.class).from(Document.class, "e"); crit.select("e.responsiblePerson.name"); @@ -148,7 +141,7 @@ public void testJoinAvoidance() { } @Test - @Category({ NoEclipselink.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class }) // NOTE: Subquery support in ON clause is only possible with Hibernate 5.1+ // TODO: report eclipselink does not support subqueries in functions public void testJoinWithSubqueryBuilder() { diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java index 9d7b8f33e0..f72cc9c0a9 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JoinTest.java @@ -5,26 +5,8 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.List; -import jakarta.persistence.EntityManager; -import jakarta.persistence.Tuple; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps; -import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps; -import com.blazebit.persistence.testsuite.entity.Version; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -32,8 +14,19 @@ import com.blazebit.persistence.JoinType; import com.blazebit.persistence.PaginatedCriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import com.blazebit.persistence.testsuite.entity.Document; +import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps; import com.blazebit.persistence.testsuite.entity.Person; +import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps; +import com.blazebit.persistence.testsuite.entity.Version; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Tuple; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @@ -368,8 +361,6 @@ public void selectWithFetchMultipleRelations() { } @Test - // Older Hibernate versions don't like fetch joining an element collection at all: https://hibernate.atlassian.net/browse/HHH-11140 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) public void selectWithFetchElementCollectionOnly() { CriteriaBuilder crit = cbf.create(em, Document.class, "a"); crit.select("owner"); @@ -468,7 +459,7 @@ public void testPaginatedJoinFetch(){ // NOTE: DB2 9.7 which is what we've got on Travis CI does not support subqueries in the on clause. See http://www-01.ibm.com/support/knowledgecenter/SSEPGG_9.7.0/com.ibm.db2.luw.messages.sql.doc/doc/msql00338n.html?cp=SSEPGG_9.7.0 // NOTE: Hibernate < 5.1 need to refer to other from clause elements which isn't supported until 5.1 @Test - @Category({ NoDB2.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoDB2.class }) public void testSizeInOnClause() { CriteriaBuilder crit = cbf.create(em, Document.class, "d") .leftJoinOn("d.partners", "p").on("SIZE(d.versions)").gtExpression("2").end(); @@ -519,7 +510,7 @@ public void work(EntityManager em) { @Test // Only hibernate supports single valued association id expressions without needing to join - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testEntityJoinEmulationReverseJoinDependencyBug() { CriteriaBuilder crit = cbf.create(em, Long.class) .from(Document.class, "d") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java index 3a033cfa3d..3c6395ffc5 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JpqlFunctionTest.java @@ -5,40 +5,34 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import jakarta.persistence.EntityManager; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.spi.JpqlFunction; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatement; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; +import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentType; +import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import jakarta.persistence.EntityManager; -import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.Person; -import org.junit.experimental.categories.Categories; -import org.junit.experimental.categories.Category; +import static org.junit.Assert.assertEquals; /** * @@ -162,7 +156,7 @@ public void builtinFunctionsReturnCorrectTypes() { } @Test - @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoH2.class, NoMSSQL.class, NoEclipselink.class}) + @Category({ NoPostgreSQL.class, NoDB2.class, NoOracle.class, NoH2.class, NoMSSQL.class, NoEclipselink.class}) public void testCastFunctionWithTargetTypeOverrideMysql() { testCastFunctionWithTargetTypeOverride("unsigned"); } @@ -192,7 +186,7 @@ public void validate(String query) { } @Test - @Category({ NoHibernate.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoHibernate.class }) public void testCastFunctionWithTargetTypeOverrideEclipselink() { final String castTypeOverride = "smallint"; CriteriaBuilder cb = cbf.create(em, Integer.class).from(Document.class, "d") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java index c3c534c8f4..e4a58574c1 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonAndXmlTest.java @@ -5,27 +5,26 @@ package com.blazebit.persistence.testsuite; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.parser.JsonParser; import com.blazebit.persistence.parser.XmlParser; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; import static org.junit.Assert.assertEquals; @@ -71,7 +70,7 @@ public void work(EntityManager em) { // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class }) + @Category({ NoEclipselink.class, NoDB2.class }) public void testToStringJson() { CriteriaBuilder criteria = cbf.create(em, Tuple.class) .from(Person.class, "p") @@ -95,7 +94,7 @@ public void testToStringJson() { // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class }) + @Category({ NoEclipselink.class, NoDB2.class }) public void testToStringXml() { CriteriaBuilder criteria = cbf.create(em, Tuple.class) .from(Person.class, "p") @@ -157,7 +156,7 @@ public void testStringXmlAgg() { // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class }) + @Category({ NoEclipselink.class, NoDB2.class }) public void testToMultiset() { CriteriaBuilder criteria = cbf.create(em, Tuple.class) .from(Person.class, "p") @@ -181,7 +180,7 @@ public void testToMultiset() { // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoDB2.class }) + @Category({ NoEclipselink.class, NoDB2.class }) public void testNestedToMultiset() { CriteriaBuilder criteria = cbf.create(em, Tuple.class) .from(Person.class, "p") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java index 1f16b127f4..9073a2fb24 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/JsonGetAndSetTest.java @@ -4,25 +4,24 @@ */ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.JsonDocument; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.List; import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import org.junit.Test; -import org.junit.experimental.categories.Category; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @author Moritz Becker @@ -56,7 +55,7 @@ public void work(EntityManager em) { } @Test - @Category({ NoH2.class, NoSQLite.class, NoFirebird.class }) + @Category({ NoH2.class }) public void testJsonGetWithLiteralPathElements() throws JsonProcessingException { List objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d") .select("d.content") @@ -102,7 +101,7 @@ public void testJsonGetWithLiteralPathElements() throws JsonProcessingException } @Test - @Category({ NoH2.class, NoSQLite.class, NoFirebird.class }) + @Category({ NoH2.class }) public void testJsonGetWithLiteralJsonPath() throws JsonProcessingException { List objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d") .select("d.content") @@ -124,7 +123,7 @@ public void testJsonGetWithLiteralJsonPath() throws JsonProcessingException { } @Test - @Category({ NoH2.class, NoSQLite.class, NoFirebird.class, NoOracle.class }) + @Category({ NoH2.class, NoOracle.class }) public void testJsonGetWithParameterizedJsonPath() throws JsonProcessingException { List objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d") .select("d.content") @@ -160,7 +159,7 @@ public void testJsonGetWithParameterizedJsonPath() throws JsonProcessingExceptio } @Test - @Category({ NoH2.class, NoSQLite.class, NoFirebird.class, NoMySQLOld.class }) + @Category({ NoH2.class }) public void testJsonSet() throws JsonProcessingException { List objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d") .select("d.content") @@ -205,7 +204,7 @@ public void testJsonSet() throws JsonProcessingException { } @Test - @Category({ NoH2.class, NoSQLite.class, NoFirebird.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoH2.class, NoOracle.class }) public void testJsonSetNull() throws JsonProcessingException { List objectRootResult = cbf.create(em, Tuple.class).from(JsonDocument.class, "d") .select("d.content") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java index 3a899c9b99..a46abb27c1 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/LimitTest.java @@ -5,17 +5,18 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.DeletePersonCTE; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IntIdEntity; @@ -23,11 +24,7 @@ import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.testsuite.entity.Workflow; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -109,7 +106,7 @@ public void testSubqueryAndOuterQueryLimit() { // Test for issue #774 @Test - @Category({NoH2.class, NoDB2.class, NoFirebird.class, NoMSSQL.class, NoMySQL.class, NoOracle.class, NoSQLite.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class}) + @Category({NoH2.class, NoDB2.class, NoMSSQL.class, NoMySQL.class, NoOracle.class, NoEclipselink.class }) public void testModificationCteQueryWithLimitInMainQuery() { List deletedPersons = cbf.create(em, DeletePersonCTE.class) .withReturning(DeletePersonCTE.class) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java index 287f54f24c..4a934d9099 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/NonPrimaryKeyJoinColumnTest.java @@ -7,16 +7,7 @@ import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.UpdateCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity; import com.blazebit.persistence.testsuite.entity.Document; @@ -58,7 +49,7 @@ protected Class[] getEntityClasses() { @Test // NOTE: Only Hibernate supports the single values association id access optimization, but doesn't do it for natural ids yet - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class}) + @Category({NoEclipselink.class}) // @Category({ NoDatanucleus.class, NoOpenJPA.class }) public void testNonPrimaryKeySingleValuedAssociationId() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class, "ref") @@ -71,7 +62,7 @@ public void testNonPrimaryKeySingleValuedAssociationId() { @Test // NOTE: Only Hibernate supports the single values association id access optimization, but doesn't do it for natural ids yet - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class}) + @Category({NoEclipselink.class}) // @Category({ NoDatanucleus.class, NoOpenJPA.class }) public void testNonPrimaryKeySingleValuedAssociationId2() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class) @@ -83,7 +74,6 @@ public void testNonPrimaryKeySingleValuedAssociationId2() { } @Test - @Category({ NoDatanucleus.class, NoOpenJPA.class }) public void testNonPrimaryKeySingleValuedAssociationId3() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class) .innerJoin("book", "b") @@ -95,7 +85,6 @@ public void testNonPrimaryKeySingleValuedAssociationId3() { } @Test - @Category({ NoDatanucleus.class, NoOpenJPA.class }) public void testNonPrimaryKeySingleValuedAssociationId4() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class, "r") .innerJoinOn("book", "b") @@ -110,7 +99,7 @@ public void testNonPrimaryKeySingleValuedAssociationId4() { // NOTE: No JPA provider supports the optimized natural id access and only EclipseLink and Hibernate seem to support natural ids @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class}) + @Category({NoEclipselink.class}) public void testNonPrimaryKeySingleValuedAssociationId5() { CriteriaBuilder cb1 = cbf.create(em, Tuple.class).from(BookISBNReferenceEntity.class, "r") .innerJoinOn("bookNormal", "b") @@ -132,7 +121,7 @@ public void testNonPrimaryKeySingleValuedAssociationId5() { // NOTE: No JPA provider supports the optimized natural id access and only EclipseLink and Hibernate seem to support natural ids @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class}) + @Category({NoEclipselink.class}) public void testNonPrimaryKeySingleValuedAssociationIdInUpdate() { Person owner = new Person("p1"); BookEntity bookEntity = new BookEntity(); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java index 7a4ae71cb2..82e2bc0e38 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OptimizedKeysetPaginationNullsTest.java @@ -5,28 +5,27 @@ package com.blazebit.persistence.testsuite; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PagedList; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.spi.CriteriaBuilderConfiguration; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.entity.KeysetEntity2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -36,9 +35,6 @@ * @author Moritz Becker * @since 1.2.0 */ -// DataNucleus has a bug with null precedence rendering -// see https://github.com/datanucleus/datanucleus-rdbms/issues/224 -@Category({ NoDatanucleus.class }) @RunWith(Parameterized.class) public class OptimizedKeysetPaginationNullsTest extends AbstractCoreTest { diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java index 9c7d9234ec..f51a35cbed 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/OrderByTest.java @@ -5,25 +5,22 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - -import com.blazebit.persistence.CriteriaBuilderFactory; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.entity.Person; import org.junit.Assert; import org.junit.Test; +import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.Criteria; import com.blazebit.persistence.CriteriaBuilder; +import com.blazebit.persistence.CriteriaBuilderFactory; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.parser.expression.SyntaxErrorException; import com.blazebit.persistence.spi.CriteriaBuilderConfiguration; import com.blazebit.persistence.testsuite.entity.Document; -import org.junit.experimental.categories.Category; - +import com.blazebit.persistence.testsuite.entity.Person; import jakarta.persistence.Tuple; +import static org.junit.Assert.assertEquals; + /** * * @author Christian Beikov @@ -171,8 +168,6 @@ public void testOrderByFunctionExpression() { } @Test - // TODO: Report datanucleus issue - @Category({ NoDatanucleus.class }) public void testOrderByAliasedCaseWhen() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d"); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java index 677273b1fd..bd1a998cb6 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationEmbeddedIdTest.java @@ -5,19 +5,21 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PagedList; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.entity.*; +import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; +import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer; +import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub; +import com.blazebit.persistence.testsuite.entity.IntIdEntity; +import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; @@ -29,8 +31,7 @@ * @since 1.2.0 */ // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062 -// TODO: report that datanucleus doesn't support element collection in an embeddable -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoEclipselink.class }) public class PaginationEmbeddedIdTest extends AbstractCoreTest { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java index 2a24f87cda..5a07b4e6bf 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PaginationTest.java @@ -5,36 +5,34 @@ package com.blazebit.persistence.testsuite; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.DefaultKeyset; import com.blazebit.persistence.DefaultKeysetPage; import com.blazebit.persistence.PagedList; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Workflow; import com.blazebit.persistence.testsuite.model.DocumentViewModel; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @@ -383,8 +381,6 @@ public void testPaginationWithNotExistingReferenceObject() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testPaginatedWithGroupByExplicitPagination() { String expectedCountQuery = "SELECT " + countPaginated("d.id", false) + " FROM Document d"; String expectedIdQuery = "SELECT d.id FROM Document d GROUP BY " + groupBy("d.id") + " ORDER BY d.id ASC"; @@ -409,8 +405,6 @@ public void testPaginatedWithGroupByExplicitPagination() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testPaginatedWithGroupBy1() { String expectedCountQuery = "SELECT " + countPaginated("d.id, "+ "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC"; @@ -435,8 +429,6 @@ public void testPaginatedWithGroupBy1() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testPaginatedWithGroupBy2() { String expectedCountQuery = "SELECT " + countPaginated("d.id, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC"; @@ -464,8 +456,6 @@ public void testPaginatedWithGroupBy2() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testPaginatedWithGroupBy3() { String expectedCountQuery = "SELECT " + countPaginated("d.id, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC"; @@ -493,8 +483,6 @@ public void testPaginatedWithGroupBy3() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testPaginatedWithGroupBy4() { String expectedCountQuery = "SELECT " + countPaginated("d.id, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "strings_1") + " ORDER BY d.id ASC"; @@ -522,8 +510,6 @@ public void testPaginatedWithGroupBy4() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testPaginatedWithGroupBy5() { String expectedCountQuery = "SELECT " + countPaginated("d.id, "+ "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.id, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.id", "d.name", "strings_1") + " ORDER BY d.name ASC, d.id ASC"; @@ -551,9 +537,8 @@ public void testPaginatedWithGroupBy5() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function // Eclipselink does not render the table alias necessary for the path expression in the count function... - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testPaginatedWithGroupBy6() { String expectedCountQuery = "SELECT " + countPaginated("d.name, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.name, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.name", "strings_1", renderNullPrecedenceGroupBy("strings_1", "ASC", "LAST")) + " ORDER BY d.name ASC, " + renderNullPrecedence("strings_1", "ASC", "LAST"); @@ -581,9 +566,8 @@ public void testPaginatedWithGroupBy6() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function // Eclipselink does not render the table alias necessary for the path expression in the count function... - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testPaginatedWithGroupBy7() { String expectedCountQuery = "SELECT " + countPaginated("d.name, d.age, " + "strings_1", true) + " FROM Document d LEFT JOIN d.strings strings_1"; String expectedIdQuery = "SELECT d.name, d.age, strings_1 FROM Document d LEFT JOIN d.strings strings_1 GROUP BY " + groupBy("d.name", "strings_1", "d.age", renderNullPrecedenceGroupBy("strings_1", "ASC", "LAST")) + " ORDER BY d.name ASC, d.age ASC, " + renderNullPrecedence("strings_1", "ASC", "LAST"); @@ -611,9 +595,8 @@ public void testPaginatedWithGroupBy7() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function // Eclipselink does not render the table alias necessary for the path expression in the count function... - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testPaginatedWithGroupBy8() { String expectedCountQuery = "SELECT " + countPaginated("d.id", false) + " FROM Document d"; String expectedIdQuery = "SELECT d.id FROM Document d GROUP BY " + groupBy("d.id", "d.name", "d.age") + " ORDER BY d.name ASC, d.age ASC, d.id ASC"; @@ -645,9 +628,8 @@ public void testPaginatedWithGroupBy8() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function // Eclipselink does not render the table alias necessary for the path expression in the count function... - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testPaginatedWithGroupBy9() { String expectedCountQuery = "SELECT " + countPaginated("d.id", false) + " FROM Document d"; String expectedIdQuery = "SELECT d.id FROM Document d GROUP BY " + groupBy("d.id") + " ORDER BY d.id ASC"; @@ -867,8 +849,6 @@ public void testOrderBySizeAlias() { } @Test - // Apparently, Datanucleus doesn't like it when using a joined element collection in a function - @Category(NoDatanucleus.class) public void testOrderBySizeAlias2() { PaginatedCriteriaBuilder cb = cbf.create(em, Tuple.class).from(Document.class, "d") .select("SIZE(d.contacts)", "contactCount") @@ -930,7 +910,7 @@ public void testSelectOnlyPropagationForWithJoins2() { @Test // Not sure what datanucleus does here.. - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipse bug, the expression "VALUE(c) IS NULL" seems illegal but JPA spec 4.6.11 allows it public void testSelectOnlyPropagationForWithJoins3() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Document.class, "d"); @@ -952,7 +932,7 @@ public void testSelectOnlyPropagationForWithJoins3() { @Test // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testCountWithExplicitLeftJoin() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Document.class, "d") .leftJoinOn(Person.class, "p") @@ -966,7 +946,7 @@ public void testCountWithExplicitLeftJoin() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testPaginateSimpleAggregate() { CriteriaBuilder cb = cbf.create(em, Tuple.class) .from(Document.class, "d") @@ -1192,7 +1172,7 @@ public void testExtractIdQueryIntoSubquery() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void testBoundedCountSimpleExternal() { PaginatedCriteriaBuilder cb = cbf.create(em, Document.class, "d") @@ -1208,7 +1188,7 @@ public void testBoundedCountSimpleExternal() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void testBoundedCountSimpleInline() { PaginatedCriteriaBuilder cb = cbf.create(em, Document.class, "d") @@ -1223,7 +1203,7 @@ public void testBoundedCountSimpleInline() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void testBoundedCountAdvancedExternal() { PaginatedCriteriaBuilder cb = cbf.create(em, Document.class, "d") @@ -1241,7 +1221,7 @@ public void testBoundedCountAdvancedExternal() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void testBoundedCountAdvancedInline() { PaginatedCriteriaBuilder cb = cbf.create(em, Document.class, "d") @@ -1258,9 +1238,7 @@ public void testBoundedCountAdvancedInline() { } // Test for #1209 - // NOTE: DataNucleus renders the literal `(1)` for the byte array parameter on PostgreSQL which is wrong @Test - @Category({ NoDatanucleus.class }) public void testPaginationImplicitGroupByWithParameter() { PaginatedCriteriaBuilder cb = cbf.create(em, Tuple.class) .from(Document.class, "d") @@ -1273,8 +1251,7 @@ public void testPaginationImplicitGroupByWithParameter() { } @Test - // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testUsePaginatedCriteriaBuilderCopyAsSubquery() { CriteriaBuilder cb = cbf.create(em, Tuple.class) .from(Document.class, "d") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java index dda05a283a..eb9a02e3eb 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicJoinTest.java @@ -7,10 +7,11 @@ import static org.junit.Assert.assertTrue; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import jakarta.persistence.Tuple; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer; import org.junit.Test; @@ -28,7 +29,7 @@ * @since 1.0.0 */ // NOTE: Hibernate 6.0 supports this when only a single subtype contains the attribute -@Category(NoHibernate60.class) +@Category(NoHibernate.class) public class PolymorphicJoinTest extends AbstractCoreTest { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java index d3d56a6e11..067599cd89 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/PolymorphicPropertyTest.java @@ -6,7 +6,8 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.PolymorphicBase; import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer; @@ -27,7 +28,7 @@ * @since 1.0.0 */ // NOTE: Hibernate 6.0 supports this when only a single subtype contains the attribute -@Category(NoHibernate60.class) +@Category(NoHibernate.class) public class PolymorphicPropertyTest extends AbstractCoreTest { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java index 7ca9ece313..b2a8bbe66e 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/QueryResultCachingTest.java @@ -5,20 +5,17 @@ package com.blazebit.persistence.testsuite; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.Person; +import java.util.Properties; + import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.entity.Document; +import com.blazebit.persistence.testsuite.entity.Person; import jakarta.persistence.TypedQuery; -import java.util.List; -import java.util.Properties; /** * @author Christian Beikov @@ -60,7 +57,7 @@ public final void tearDown() { // Apparently, only Hibernate is able to cache scalar queries... @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void queryResultCachingTest() { TypedQuery query = cbf.create(em, String.class) .from(Document.class) @@ -80,7 +77,7 @@ public void queryResultCachingTest() { // Apparently, only Hibernate is able to cache scalar queries... @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void queryResultCachingWithObjectBuilderTest() { TypedQuery query = cbf.create(em, String.class) .from(Document.class) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java index 50620e9844..36d680f8e6 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/RawTypesTest.java @@ -5,11 +5,10 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.entity.RawTypeEntity; -import org.junit.Test; -import org.junit.experimental.categories.Category; /** * This test is for issue #344 @@ -26,9 +25,7 @@ protected Class[] getEntityClasses() { }; } - // NOTE: Datanucleus does not support the MapKeyClass yet: https://github.com/datanucleus/datanucleus-core/issues/185 @Test - @Category({ NoDatanucleus.class }) public void buildingQueryWithEntityThatUsesRawTypesWorks() { CriteriaBuilder criteria = cbf.create(em, RawTypeEntity.class, "d"); criteria.select("d.list.id"); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java index 970acacd11..094a8a9d98 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SecondaryTableTest.java @@ -5,13 +5,14 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.UpdateCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import com.blazebit.persistence.testsuite.entity.SecondaryTableEntityBase; import com.blazebit.persistence.testsuite.entity.SecondaryTableEntitySub; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,9 +38,9 @@ public void secondaryTableWithJoinedInheritanceTest() { assertFalse(criteria.getResultList().isEmpty()); } + // NOTE: Hibernate ORM bug: https://hibernate.atlassian.net/browse/HHH-18813 @Test - // DataNucleus doesn't handle that properly - @Category({ NoDatanucleus.class }) + @Category({ NoHibernate.class } ) public void updateSecondaryTableAttribute() { SecondaryTableEntitySub b = new SecondaryTableEntitySub(); b.setB(4L); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java index 30e4c9a6de..50967a88fb 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SelectPolymorphicTest.java @@ -5,22 +5,20 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.TPCBase; import com.blazebit.persistence.testsuite.entity.TPCSub1; import com.blazebit.persistence.testsuite.entity.TPCSub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -54,9 +52,8 @@ public void work(EntityManager em) { }); } - // NOTE: MySQL has no CTE support @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testSelectTablePerClassWithCte() throws Exception { CriteriaBuilder cb = cbf.create(em, TPCBase.class, "t") .with(IdHolderCTE.class, false) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java index b918f6092a..6851cde109 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SetOperationTest.java @@ -5,12 +5,11 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - import java.util.List; -import jakarta.persistence.EntityManager; -import jakarta.persistence.Tuple; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.FinalSetOperationCriteriaBuilder; @@ -21,19 +20,17 @@ import com.blazebit.persistence.StartOngoingSetOperationCriteriaBuilder; import com.blazebit.persistence.impl.BuilderChainingException; import com.blazebit.persistence.spi.SetOperationType; -import com.blazebit.persistence.testsuite.entity.*; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; +import com.blazebit.persistence.testsuite.entity.Document; +import com.blazebit.persistence.testsuite.entity.IdHolderCTE; +import com.blazebit.persistence.testsuite.entity.Person; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Tuple; + +import static org.junit.Assert.assertEquals; /** * Firebird like MySQL do not support intersect and except operators. @@ -87,7 +84,7 @@ public void setUp() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testPrecedence() { FinalSetOperationCriteriaBuilder cb = cbf.create(em, String.class) .from(Document.class, "d1") @@ -116,7 +113,7 @@ public void testPrecedence() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testObjectBuilder() { FinalSetOperationCriteriaBuilder cb = cbf.create(em, Tuple.class) .from(Document.class, "d1") @@ -142,7 +139,7 @@ public void testObjectBuilder() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testUnionAll() { FinalSetOperationCriteriaBuilder cb = cbf.create(em, String.class) .from(Document.class, "d1") @@ -166,7 +163,7 @@ public void testUnionAll() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testUnionAllOrderBy() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d1") @@ -192,7 +189,7 @@ public void testUnionAllOrderBy() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testUnionAllOrderBySubqueryLimit() { CriteriaBuilder cb = cbf .create(em, Document.class, "d") @@ -226,7 +223,7 @@ public void testUnionAllOrderBySubqueryLimit() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testUnionAllOrderByOperandLimit() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class) @@ -255,7 +252,7 @@ public void testUnionAllOrderByOperandLimit() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testUnion() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d1") @@ -278,9 +275,8 @@ public void testUnion() { } @Test - // TODO: why no hibernate 4.2? // NOTE: H2 does not support the PARTITION clause in the ROW_NUMBER function, so we can't emulate EXCEPT ALL - @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testExceptAll() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d1") @@ -303,7 +299,7 @@ public void testExceptAll() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testExcept() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d1") @@ -326,9 +322,8 @@ public void testExcept() { } @Test - // TODO: why no hibernate 4.2? // NOTE: H2 does not support the PARTITION clause in the ROW_NUMBER function, so we can't emulate INTERSECT ALL - @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testIntersectAll() { FinalSetOperationCriteriaBuilder cb = cbf.create(em, String.class) .from(Document.class, "d1") @@ -352,7 +347,7 @@ public void testIntersectAll() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testIntersect() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d1") @@ -377,7 +372,7 @@ public void testIntersect() { /* Set operation nesting */ @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testNestedIntersectWithUnion() { FinalSetOperationCriteriaBuilder cb = cbf .startSet(em, Document.class) @@ -412,7 +407,7 @@ public void testNestedIntersectWithUnion() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testIntersectWithNestedUnion() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class) @@ -443,7 +438,7 @@ public void testIntersectWithNestedUnion() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testRightNesting() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class) @@ -493,7 +488,7 @@ public void testRightNesting() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testLeftNesting() { FinalSetOperationCriteriaBuilder cb = cbf .startSet(em, Document.class) @@ -540,7 +535,7 @@ public void testLeftNesting() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testLeftRightNesting() { FinalSetOperationCriteriaBuilder cb = cbf .startSet(em, Document.class) @@ -596,7 +591,7 @@ public void testLeftRightNesting() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testAttributeOrderByLimit() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class) @@ -642,7 +637,7 @@ public void testAttributeOrderByLimit() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testAliasOrderByLimit() { FinalSetOperationCriteriaBuilder cb = cbf.create(em, String.class) .from(Document.class, "d1") @@ -690,7 +685,7 @@ public void testAliasOrderByLimit() { // NOTE: H2 does not seem to support set operations in CTEs properly @Test - @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testCTENesting() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d") @@ -763,7 +758,7 @@ public void testCTENesting() { // NOTE: H2 does not seem to support set operations in CTEs properly @Test - @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testCTERightNesting() { FinalSetOperationCriteriaBuilder cb = cbf .create(em, Document.class, "d") @@ -812,7 +807,7 @@ public void testCTERightNesting() { // NOTE: H2 does not seem to support set operations in CTEs properly @Test - @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testCTELeftNesting() { CriteriaBuilder cb = cbf.create(em, Document.class) .withStartSet(IdHolderCTE.class, false) @@ -876,7 +871,7 @@ public void testCTELeftNesting() { /* Subquery set operations */ @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testSubqueryNesting() { CriteriaBuilder cb = cbf .create(em, Document.class, "d") @@ -931,7 +926,7 @@ public void testSubqueryNesting() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testSubqueryLeftNesting() { CriteriaBuilder cb = cbf .create(em, Document.class, "d") @@ -997,7 +992,7 @@ public void testSubqueryLeftNesting() { // NOTE: H2 does not seem to support set operations in subqueries with limit properly @Test - @Category({ NoH2.class, NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testSubqueryOrderByLimit() { CriteriaBuilder cb = cbf.create(em, String.class) .from(Document.class, "doc") @@ -1047,7 +1042,7 @@ public void testSubqueryOrderByLimit() { } @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testWithStartSetEmpty() { final CriteriaBuilder cb = cbf.create(em, IdHolderCTE.class) .withStartSet(IdHolderCTE.class, false) @@ -1076,8 +1071,7 @@ public void testWithStartSetEmpty() { } @Test - // H2 broke in 1.4.198, will be fixed in 1.4.200 - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoH2.class }) + @Category({ NoEclipselink.class }) public void testSetSubqueryAliasIsolation() { CriteriaBuilder cb = cbf.create(em, Document.class) .from(Document.class, "d1") @@ -1109,7 +1103,7 @@ protected String setOperation(SetOperationType type, String... queries) { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testNotEndedLeaf() { CriteriaBuilder cb = cbf.create(em, Document.class); LeafOngoingSetOperationCriteriaBuilder result = cb @@ -1123,7 +1117,7 @@ public void testNotEndedLeaf() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testNotEndedStart() { CriteriaBuilder cb = cbf.create(em, Document.class); StartOngoingSetOperationCriteriaBuilder> result = cb @@ -1135,7 +1129,7 @@ public void testNotEndedStart() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testNotEndedStartLeaf() { CriteriaBuilder cb = cbf.create(em, Document.class); LeafOngoingFinalSetOperationCriteriaBuilder result = cb @@ -1147,7 +1141,7 @@ public void testNotEndedStartLeaf() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testNotEndedOngoing() { CriteriaBuilder cb = cbf.create(em, Document.class); OngoingFinalSetOperationCriteriaBuilder> result = cb @@ -1159,7 +1153,7 @@ public void testNotEndedOngoing() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testNotEndedOngoingLeaf() { CriteriaBuilder cb = cbf.create(em, Document.class); LeafOngoingFinalSetOperationCriteriaBuilder result = cb @@ -1171,7 +1165,7 @@ public void testNotEndedOngoingLeaf() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testNotEndedSubqueryLeaf() { CriteriaBuilder cb = cbf.create(em, Document.class); FinalSetOperationSubqueryBuilder> result = cb diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java index 7cfa415759..1e7c924398 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SingleValuedAssociationOneToOneJoinTableTest.java @@ -6,15 +6,7 @@ package com.blazebit.persistence.testsuite; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate52; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate53; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.DocumentForOneToOneJoinTable; import com.blazebit.persistence.testsuite.entity.DocumentForOneToOne; import com.blazebit.persistence.testsuite.entity.DocumentInfo; @@ -32,8 +24,6 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: Datanucleus generates wrong DDL for OneToOne JoinTable mappings: https://github.com/datanucleus/datanucleus-core/issues/196 -@Category({ NoDatanucleus.class }) public class SingleValuedAssociationOneToOneJoinTableTest extends AbstractCoreTest { @Override @@ -55,7 +45,6 @@ public void oneToOneJoinTableSingleValuedAssociationIsNull() { } @Test - @Category({NoHibernate52.class, NoHibernate53.class}) public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccess() { Assume.assumeFalse(supportsTableGroupJoins()); @@ -66,7 +55,7 @@ public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccess() { } @Test - @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate50.class, NoHibernate43.class, NoHibernate42.class}) + @Category({NoEclipselink.class}) public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccessWithTableGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -78,7 +67,6 @@ public void oneToOneJoinTableSingleValuedAssociationRelativeIdAccessWithTableGro } @Test - @Category({NoHibernate52.class, NoHibernate53.class}) public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccess() { Assume.assumeFalse(supportsTableGroupJoins()); @@ -89,7 +77,7 @@ public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccess() { } @Test - @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate50.class, NoHibernate43.class, NoHibernate42.class}) + @Category({NoEclipselink.class}) public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccessWithTableGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -101,7 +89,6 @@ public void oneToOneJoinTableSingleValuedAssociationAbsoluteIdAccessWithTableGro } @Test - @Category({NoHibernate52.class, NoHibernate53.class}) public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride1() { Assume.assumeFalse(supportsTableGroupJoins()); @@ -113,7 +100,7 @@ public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride1() { } @Test - @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate50.class, NoHibernate43.class, NoHibernate42.class}) + @Category({NoEclipselink.class}) public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride1WithTableGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -144,7 +131,7 @@ public void oneToOneJoinTableSingleValuedAssociationIdAccessJoinOverride3() { } @Test - @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class}) + @Category({NoEclipselink.class}) public void leftJoinDereferenedForeignJoinTableWithTableGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -157,7 +144,7 @@ public void leftJoinDereferenedForeignJoinTableWithTableGroupJoins() { } @Test - @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class}) + @Category({NoEclipselink.class}) public void leftJoinDereferenedForeignJoinTableInverseWithTableGroupJoins() { Assume.assumeTrue(supportsTableGroupJoins()); @@ -170,7 +157,7 @@ public void leftJoinDereferenedForeignJoinTableInverseWithTableGroupJoins() { } @Test - @Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate51.class, NoHibernate52.class, NoHibernate53.class}) + @Category({NoEclipselink.class}) public void leftJoinDereferenedForeignJoinTable() { Assume.assumeFalse(supportsTableGroupJoins()); Assume.assumeTrue(jpaProvider.supportsEntityJoin()); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java index d12cad08bc..466bc072c0 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SizeTransformationTest.java @@ -5,24 +5,23 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.impl.function.subquery.SubqueryFunction; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.testsuite.entity.Workflow; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -33,8 +32,6 @@ */ public class SizeTransformationTest extends AbstractCoreTest { - // TODO: create datanucleus issue - @Category(NoDatanucleus.class) @Test public void testSizeToCountTransformationWithElementCollectionIndexed1() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Workflow.class, "w") @@ -44,8 +41,6 @@ public void testSizeToCountTransformationWithElementCollectionIndexed1() { cb.getResultList(); } - // TODO: create datanucleus issue - @Category(NoDatanucleus.class) @Test public void testSizeToCountTransformationWithElementCollectionIndexed2() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Workflow.class, "w") @@ -57,8 +52,6 @@ public void testSizeToCountTransformationWithElementCollectionIndexed2() { cb.getResultList(); } - // TODO: create datanucleus issue - @Category(NoDatanucleus.class) @Test public void testSizeToCountTransformationWithElementCollectionBasic1() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Workflow.class, "w") @@ -68,8 +61,6 @@ public void testSizeToCountTransformationWithElementCollectionBasic1() { cb.getResultList(); } - // TODO: create datanucleus issue - @Category(NoDatanucleus.class) @Test public void testSizeToCountTransformationWithElementCollectionBasic2() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Workflow.class, "w") @@ -148,9 +139,6 @@ public void testSizeToCountTransformationWithMap2() { cb.getResultList(); } - // TODO: create datanucleus issue - // fails with datanucleus-4 - @Category(NoDatanucleus4.class) @Test public void testSizeToCountTransformationWithCollectionBag() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Document.class, "d") @@ -160,9 +148,6 @@ public void testSizeToCountTransformationWithCollectionBag() { cb.getResultList(); } - // TODO: create datanucleus issue - // fails with datanucleus-5 - @Category(NoDatanucleus.class) @Test public void testSizeToCountTransformationWithListBag() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Document.class, "d") @@ -183,9 +168,7 @@ public void testDuplicateSizeExpressionsInSelect() { cb.getResultList(); } - // NOTE: DataNucleus renders the literal `(1)` for the byte array parameter on PostgreSQL which is wrong @Test - @Category({ NoDatanucleus.class }) public void testDisableCountTransformationWhenParameterUsedInSelect() { CriteriaBuilder cb = cbf.create(em, Tuple.class).from(Document.class, "d") .select("CASE WHEN d.age > 0 THEN d.byteArray ELSE :byteArray END") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java index d96a4e41b6..e7b9929ebf 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/SubqueryTest.java @@ -5,30 +5,27 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.Tuple; +import java.util.List; -import com.blazebit.persistence.spi.FunctionRenderContext; -import com.blazebit.persistence.spi.JpqlMacro; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PaginatedCriteriaBuilder; import com.blazebit.persistence.impl.BuilderChainingException; +import com.blazebit.persistence.spi.FunctionRenderContext; +import com.blazebit.persistence.spi.JpqlMacro; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Version; -import org.junit.experimental.categories.Category; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Tuple; -import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @@ -327,7 +324,7 @@ public void testSubqueryCorrelatesOverRelation() { // This test compares ids @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testSubqueryCorrelatesArrayExpression() { CriteriaBuilder crit = cbf.create(em, Document.class, "d") .whereExists() @@ -354,8 +351,6 @@ public void testSubqueryCorrelatesArrayExpressionEntityEqual() { } @Test - // TODO: Report datanucleus issue - @Category({ NoDatanucleus.class }) public void testMultipleCorrelationsWithJoins() { CriteriaBuilder crit = cbf.create(em, Document.class, "d") .where("owner").in() @@ -400,8 +395,6 @@ public void testMultipleCorrelationsWithJoins() { } @Test - // TODO: Report datanucleus issue - @Category({ NoDatanucleus.class }) public void testReorderExplicitJoins() { CriteriaBuilder crit = cbf.create(em, Document.class, "d") .where("owner").in() @@ -492,7 +485,9 @@ public void testSubqueryCollectionAccessAddsJoin() { crit.getResultList(); } + // NOTE: Hibernate ORM doesn't detect that it has to use the join alias column @Test + @Category({ NoHibernate.class }) public void testSubqueryUsesOuterJoin() { CriteriaBuilder cb = cbf.create(em, Tuple.class) .from(Document.class, "d") @@ -574,7 +569,7 @@ public void testMultipleJoinPathSubqueryCollectionAccess() { @Test // A special test for Hibernate that needs a different query to be generated to properly work - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testJoinElementCollectionsOnCorrelatedInverseAssociations() { CriteriaBuilder crit = cbf.create(em, Integer.class) .from(Document.class, "d") @@ -687,8 +682,6 @@ public void testPaginationWithOuterAttributeInSubquery() { } @Test - // NOTE: Datanucleus has a bug here: https://github.com/datanucleus/datanucleus-core/issues/173 - @Category({ NoDatanucleus.class }) public void testMultiLevelSubqueryAliasVisibility() { final CriteriaBuilder cb = cbf.create(em, Long.class) .from(Document.class, "d") @@ -714,8 +707,6 @@ public void testMultiLevelSubqueryAliasVisibility() { } @Test - // Test for issue #504 - @Category({ NoDatanucleus.class }) public void testMultiLevelSubqueryImplicitAliasCollision() { final CriteriaBuilder cb = cbf.create(em, Long.class) .from(Document.class) diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java index a8eced4e50..28fc99504a 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatMultiLevelTest.java @@ -5,8 +5,12 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Parent; import com.blazebit.persistence.testsuite.entity.Sub1; @@ -15,12 +19,9 @@ import com.blazebit.persistence.testsuite.entity.Sub2; import com.blazebit.persistence.testsuite.entity.Sub2Sub1; import com.blazebit.persistence.testsuite.entity.Sub2Sub2; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @@ -43,8 +44,6 @@ protected Class[] getEntityClasses() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class }) public void implicitJoinTreatedRoot() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(Parent.class, "p"); @@ -54,9 +53,8 @@ public void implicitJoinTreatedRoot() { } @Test - // NOTE: Datanucleus does not seem to support this kind of model? TODO: report the error // NOTE: EclipseLink is just fundamentally broken in this regard... - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void multiTreatWithDiscriminatorColumn() { // Given Sub1 sub1 = new Sub1(); @@ -78,9 +76,8 @@ public void multiTreatWithDiscriminatorColumn() { } @Test - // NOTE: Datanucleus does not seem to support this kind of model? TODO: report the error // NOTE: EclipseLink is just fundamentally broken in this regard... - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void treatWithSuperTypeColumnAccess() { // Given Sub1 sub1 = new Sub1(); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java index 9575134a1e..7a50a82ee7 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatTest.java @@ -5,16 +5,19 @@ package com.blazebit.persistence.testsuite; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.JoinType; import com.blazebit.persistence.parser.expression.SyntaxErrorException; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.entity.*; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import com.blazebit.persistence.testsuite.entity.IntIdEntity; +import com.blazebit.persistence.testsuite.entity.PolymorphicBase; +import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer; +import com.blazebit.persistence.testsuite.entity.PolymorphicSub1; +import com.blazebit.persistence.testsuite.entity.PolymorphicSub2; import static org.junit.Assert.assertEquals; @@ -51,8 +54,6 @@ public void treatOfTreatAsExpressionRootNotAllowed() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class }) public void implicitJoinTreatedRoot() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -62,8 +63,6 @@ public void implicitJoinTreatedRoot() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class }) public void treatInAggregateHaving() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -78,8 +77,6 @@ public void treatInAggregateHaving() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class }) public void treatedRootInCaseWhenCondition() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -91,8 +88,6 @@ public void treatedRootInCaseWhenCondition() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class }) public void treatedRootInCaseWhenResult() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -104,10 +99,8 @@ public void treatedRootInCaseWhenResult() { } @Test - // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation" - @Category({ NoDatanucleus.class , NoDatanucleus4.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void fetchJoinTreatedRoot() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -117,10 +110,8 @@ public void fetchJoinTreatedRoot() { } @Test - // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation" - @Category({ NoDatanucleus.class , NoDatanucleus4.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void fetchJoinTreatedNode() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -131,8 +122,6 @@ public void fetchJoinTreatedNode() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class }) public void implicitJoinTreatedRelation() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -142,9 +131,8 @@ public void implicitJoinTreatedRelation() { } @Test - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation" - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void singleValuedAssociationIdOfTreatedImplicitJoinedRelation() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "relation1"); @@ -154,10 +142,8 @@ public void singleValuedAssociationIdOfTreatedImplicitJoinedRelation() { } @Test - // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error // NOTE: Eclipselink does not support root treat joins i.e. "JOIN TREAT(..).relation" - @Category({ NoDatanucleus.class , NoDatanucleus4.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void implicitJoinTreatedRootTreatJoin() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -167,9 +153,6 @@ public void implicitJoinTreatedRootTreatJoin() { } @Test - // NOTE: Datanucleus4 reports: We do not currently support JOIN to TREAT - // NOTE: Datanucleus does not support root treats properly with joined inheritance. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class, NoDatanucleus4.class }) public void joinTreatedRelation() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -181,9 +164,8 @@ public void joinTreatedRelation() { } @Test - // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error // Eclipselink and Datanucleus do not support root treat joins - @Category({ NoDatanucleus.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void joinTreatedRoot() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -194,9 +176,8 @@ public void joinTreatedRoot() { } @Test - // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error // Eclipselink does not support dereferencing of TREAT join path elements - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void joinTreatedRootEmbeddable() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -207,9 +188,8 @@ public void joinTreatedRootEmbeddable() { } @Test - // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error // Eclipselink does not support dereferencing of TREAT join path elements - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void selectTreatedRootEmbeddable() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -219,8 +199,7 @@ public void selectTreatedRootEmbeddable() { } @Test - // NOTE: With datanucleus this only fails with INNER JOIN but works with left join. Maybe a bug? TODO: report the error - @Category({ NoDatanucleus.class, NoHibernate.class }) + @Category({ NoHibernate.class }) public void treatJoinTreatedRootRelation() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); @@ -233,8 +212,7 @@ public void treatJoinTreatedRootRelation() { } @Test - // NOTE: Datanucleus fails with a NPE - @Category({ NoEclipselink.class, NoDatanucleus4.class }) + @Category({ NoEclipselink.class }) public void implicitJoinTreatedImplicitCorrelation() { CriteriaBuilder crit = cbf.create(em, PolymorphicBase.class, "p") .whereExists().from(PolymorphicSub1.class, "sub1") diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java index eb98af1852..b434b90d5a 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedCorrelatedSubqueryTest.java @@ -5,8 +5,13 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.PolymorphicBase; @@ -14,12 +19,7 @@ import com.blazebit.persistence.testsuite.entity.PolymorphicSub1; import com.blazebit.persistence.testsuite.entity.PolymorphicSub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -28,8 +28,7 @@ * @since 1.4.0 */ // NOTE: EclipseLink does not support subtype property access which is required here -// NOTE: Seems Datanucleus fails to properly interpret the entity literal -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class TreatedCorrelatedSubqueryTest extends AbstractCoreTest { private PolymorphicSub1 root2; diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java index 704f997c9a..4afe506fb7 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/TreatedEntityJoinTest.java @@ -5,25 +5,21 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.PolymorphicBase; import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer; import com.blazebit.persistence.testsuite.entity.PolymorphicSub1; import com.blazebit.persistence.testsuite.entity.PolymorphicSub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -31,9 +27,6 @@ * @author Moritz Becker * @since 1.4.0 */ -// NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink -// NOTE: Seems Datanucleus fails to properly interpret the entity literal -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class }) public class TreatedEntityJoinTest extends AbstractCoreTest { private PolymorphicSub1 root2; @@ -116,7 +109,7 @@ public void test2() { // NOTE: EclipseLink requires a join for "relation1" that it doesn't add... @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void entityJoinTreat() { CriteriaBuilder criteria = cbf.create(em, Integer.class); criteria.from(PolymorphicBase.class, "p"); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java index 51562b513d..aeb1e5cb7e 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateEmbeddableComplexTest.java @@ -5,29 +5,24 @@ package com.blazebit.persistence.testsuite; -import static org.junit.Assert.assertEquals; - -import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityId; +import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.tx.TxVoidWork; - import jakarta.persistence.EntityManager; +import static org.junit.Assert.assertEquals; + /** * This kind of mapping is not required to be supported by a JPA implementation. * @@ -55,7 +50,7 @@ protected Class[] getEntityClasses() { @Test // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062 // TODO: report that datanucleus doesn't support element collection in an embeddable - @Category({ NoH2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class }) public void testUpdateWithReturningEmbeddable(){ final String newEmbeddableTestEntityIdKey = "newKey"; @@ -82,7 +77,7 @@ public void work(EntityManager em) { @Test // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062 // TODO: report that datanucleus doesn't support element collection in an embeddable - @Category({ NoH2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class }) public void testUpdateWithReturningExplicitId(){ final String intIdEntity1Key = "1"; diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java index 6bc625c04e..28c67a2d70 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdatePolymorphicTest.java @@ -5,19 +5,21 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.ReturningResult; import com.blazebit.persistence.UpdateCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.PolymorphicBase; @@ -31,15 +33,8 @@ import com.blazebit.persistence.testsuite.entity.TPCSub1; import com.blazebit.persistence.testsuite.entity.TPCSub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -157,9 +152,8 @@ public void work(EntityManager em) { } // NOTE: H2 and MySQL only support returning generated keys - // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testTablePerClassWithCte() { transactional(new TxVoidWork() { @Override @@ -190,9 +184,8 @@ public void work(EntityManager em) { } // NOTE: H2 and MySQL only support returning generated keys - // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testJoinedWithCte() { transactional(new TxVoidWork() { @Override @@ -223,9 +216,8 @@ public void work(EntityManager em) { } // NOTE: H2 and MySQL only support returning generated keys - // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoMySQLOld.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoEclipselink.class }) public void testSingleTableWithCte() { transactional(new TxVoidWork() { @Override @@ -257,7 +249,7 @@ public void work(EntityManager em) { @Test // NOTE: H2 and MySQL only support returning generated keys - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturning() { transactional(new TxVoidWork() { @Override @@ -278,7 +270,7 @@ public void work(EntityManager em) { @Test // NOTE: H2 and MySQL only support returning generated keys - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturning() { transactional(new TxVoidWork() { @Override @@ -299,7 +291,7 @@ public void work(EntityManager em) { @Test // NOTE: H2 and MySQL only support returning generated keys - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturning() { transactional(new TxVoidWork() { @Override @@ -320,7 +312,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturningInCTE() { transactional(new TxVoidWork() { @Override @@ -351,7 +343,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturningInCTE() { transactional(new TxVoidWork() { @Override @@ -382,7 +374,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturningInCTE() { transactional(new TxVoidWork() { @Override @@ -417,7 +409,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturningInCTESelectOld() { transactional(new TxVoidWork() { @Override @@ -450,7 +442,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturningInCTESelectOld() { transactional(new TxVoidWork() { @Override @@ -483,7 +475,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturningInCTESelectOld() { transactional(new TxVoidWork() { @Override @@ -518,7 +510,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testTablePerClassReturningInCTESelectNew() { transactional(new TxVoidWork() { @Override @@ -551,7 +543,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testJoinedReturningInCTESelectNew() { transactional(new TxVoidWork() { @Override @@ -584,7 +576,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testSingleTableReturningInCTESelectNew() { transactional(new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java index c7e6b3b204..5b9c73931b 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/UpdateTest.java @@ -5,35 +5,30 @@ package com.blazebit.persistence.testsuite; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.TreeSet; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.ReturningResult; import com.blazebit.persistence.UpdateCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentNodeCTE; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.TreeSet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -104,9 +99,8 @@ public void work(EntityManager em) { } // NOTE: EclipseLink can update neither d.nameObject.intIdEntity nor d.nameObject.intIdEntity.id so associations in embeddables don't work here - // NOTE: DN4 also doesn't seem to support this @Test - @Category({ NoEclipselink.class, NoDatanucleus4.class }) + @Category({ NoEclipselink.class }) public void testSetEmbeddable() { transactional(new TxVoidWork() { @Override @@ -126,7 +120,7 @@ public void work(EntityManager em) { // NOTE: This requires advanced SQL support @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testImplicitJoin() { transactional(new TxVoidWork() { @Override @@ -147,7 +141,7 @@ public void work(EntityManager em) { // NOTE: This requires advanced SQL support @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testMultipleDeepImplicitJoin() { transactional(new TxVoidWork() { @Override @@ -176,7 +170,7 @@ public void work(EntityManager em) { // Test for issue #1615 // NOTE: This requires advanced SQL support @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesJoin() { transactional(new TxVoidWork() { @Override @@ -245,7 +239,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningAll() { transactional(new TxVoidWork() { @Override @@ -269,7 +263,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningLast() { transactional(new TxVoidWork() { @Override @@ -292,7 +286,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoMySQL.class, NoEclipselink.class }) public void testReturningLastWithCte() { transactional(new TxVoidWork() { @Override @@ -326,7 +320,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testUpdateReturningSelectOld() { transactional(new TxVoidWork() { @Override @@ -361,7 +355,7 @@ public void work(EntityManager em) { // NOTE: Currently only PostgreSQL and DB2 support returning from within a CTE @Test - @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMSSQL.class, NoMySQL.class, NoEclipselink.class }) public void testUpdateReturningSelectNew() { transactional(new TxVoidWork() { @Override @@ -398,7 +392,7 @@ public void work(EntityManager em) { // NOTE: H2 and MySQL only support returning generated keys // NOTE: MySQL does not support CTEs @Test - @Category({ NoH2.class, NoOracle.class, NoSQLite.class, NoFirebird.class, NoMySQL.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoH2.class, NoOracle.class, NoMySQL.class, NoEclipselink.class }) public void testQueryCaching() { TxVoidWork work = new TxVoidWork() { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java index a6ff0c53c6..50a0bde8d1 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/ValuesClauseTest.java @@ -5,16 +5,25 @@ package com.blazebit.persistence.testsuite; +import java.sql.Connection; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import java.util.function.Consumer; +import javax.sql.DataSource; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentNodeCTE; import com.blazebit.persistence.testsuite.entity.DocumentType; @@ -24,25 +33,9 @@ import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.PersonCTE; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; import jakarta.persistence.TypedQuery; -import javax.sql.DataSource; -import java.sql.Connection; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; -import java.util.function.Consumer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -121,7 +114,7 @@ public void setUp() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunction() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Long.class, "allowedAge", Collections.singleton(1L)); @@ -141,7 +134,7 @@ public void testValuesEntityFunction() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithEmbeddable() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(NameObject.class, "embeddable", Collections.singleton(new NameObject("abc", "123"))); @@ -164,7 +157,7 @@ public void testValuesEntityFunctionWithEmbeddable() { @Test // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithPluralOnlyEmbeddable() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(NameObjectContainer.class, "embeddable", Collections.singleton(new NameObjectContainer("test", new NameObject("abc", "123")))); @@ -187,7 +180,7 @@ public void testValuesEntityFunctionWithPluralOnlyEmbeddable() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikeBasic() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "name", "n", Collections.singleton("someName")); @@ -202,7 +195,7 @@ public void testValuesEntityFunctionLikeBasic() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikeEnum() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "documentType", "t", Collections.singleton(DocumentType.NOVEL)); @@ -217,7 +210,7 @@ public void testValuesEntityFunctionLikeEnum() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikeCalendar() { CriteriaBuilder cb = cbf.create(em, Tuple.class); Calendar cal = Calendar.getInstance(); @@ -238,7 +231,7 @@ public void testValuesEntityFunctionLikeCalendar() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikeEmbeddable() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "nameObject", "t", Collections.singleton(new NameObject("123", "abc"))); @@ -253,7 +246,7 @@ public void testValuesEntityFunctionLikeEmbeddable() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikeEntity() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "owner", "t", Collections.singleton(new Person(1L))); @@ -268,7 +261,7 @@ public void testValuesEntityFunctionLikeEntity() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikePluralBasic() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "strings", "t", Collections.singleton("test")); @@ -284,7 +277,7 @@ public void testValuesEntityFunctionLikePluralBasic() { @Test // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikePluralEmbeddable() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "names", "t", Collections.singleton(new NameObject("123", "abc"))); @@ -299,7 +292,7 @@ public void testValuesEntityFunctionLikePluralEmbeddable() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikePluralEntity() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "partners", "t", Collections.singleton(new Person(1L))); @@ -314,7 +307,7 @@ public void testValuesEntityFunctionLikePluralEntity() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikePluralIndex() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "INDEX(people)", "t", Collections.singleton(1)); @@ -329,7 +322,7 @@ public void testValuesEntityFunctionLikePluralIndex() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLikePluralKey() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Document.class, "KEY(stringMap)", "t", Collections.singleton("key")); @@ -344,7 +337,7 @@ public void testValuesEntityFunctionLikePluralKey() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testIdentifiableValuesEntityFunctionGroupBy() { CriteriaBuilder cb = cbf.create(em, Tuple.class); @@ -361,7 +354,7 @@ public void testIdentifiableValuesEntityFunctionGroupBy() { // Test for #305 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithParameterInSelect() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Long.class, "allowedAge", Arrays.asList(1L, 2L)); @@ -384,7 +377,7 @@ public void testValuesEntityFunctionWithParameterInSelect() { // Test for #305 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithParameterInSelectSubquery() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.from(Document.class, "doc"); @@ -404,7 +397,7 @@ public void testValuesEntityFunctionWithParameterInSelectSubquery() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionParameters() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Long.class, "allowedAge", Arrays.asList(1L, 2L)); @@ -429,8 +422,7 @@ public void testValuesEntityFunctionParameters() { } @Test - // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionLeftJoin() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(Long.class, "allowedAge", Arrays.asList(1L, 2L, 3L)); @@ -461,8 +453,7 @@ public void testValuesEntityFunctionLeftJoin() { } @Test - // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithEntity() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(IntIdEntity.class, "intEntity", Arrays.asList( @@ -493,8 +484,7 @@ public void testValuesEntityFunctionWithEntity() { } @Test - // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionParameter() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.fromValues(IntIdEntity.class, "intEntity", 1); @@ -547,8 +537,7 @@ public void testValuesEntityFunctionParameter() { } @Test - // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionParameterWithoutNullsFilter() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false"); @@ -571,11 +560,7 @@ public void testValuesEntityFunctionParameterWithoutNullsFilter() { } @Test - // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) - // No hibernate for now, see https://hibernate.atlassian.net/browse/HHH-11340 - // H2 before 1.4.199 does not support parameters in the CTE http://dba.stackexchange.com/a/78449 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionInCte() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false"); @@ -606,7 +591,7 @@ public void testValuesEntityFunctionInCte() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithCteEntity() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false"); @@ -625,7 +610,7 @@ public void testValuesEntityFunctionWithCteEntity() { } @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testFromValuesWithEmbeddables() { final Document doc1 = new Document("doc1"); doc1.setNameObject(new NameObject("doc1Primary", "doc1Secondary")); @@ -643,8 +628,7 @@ public void testFromValuesWithEmbeddables() { } @Test - // H2 before 1.4.199 does not support parameters in the CTE http://dba.stackexchange.com/a/78449 - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testValuesEntityFunctionWithCteInCteWithSetOperation() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false"); @@ -678,8 +662,7 @@ public void testValuesEntityFunctionWithCteInCteWithSetOperation() { } @Test - // H2 before 1.4.199 does not support parameters in the CTE http://dba.stackexchange.com/a/78449 - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testIdentifiableValuesEntityFunction() { CriteriaBuilder cb = cbf.create(em, Tuple.class); cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false"); diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java index d4b3c62eae..3943390aac 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/WindowFunctionTest.java @@ -5,18 +5,18 @@ package com.blazebit.persistence.testsuite; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; -import java.util.List; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -27,7 +27,6 @@ * @author Sayra Ranjha * @since 1.4.0 */ -@Category({ NoMySQLOld.class }) public class WindowFunctionTest extends AbstractCoreTest { @Override diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java index 2043ac4bab..ed227c4fb1 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinManyToManyMapValueTest.java @@ -5,7 +5,7 @@ package com.blazebit.persistence.testsuite.treat.builder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -16,7 +16,7 @@ // NOTE: Bug in ORM 6.3: https://hibernate.atlassian.net/browse/HHH-17385 @RunWith(Parameterized.class) -@Category({ NoHibernate60.class }) +@Category({ NoHibernate62.class }) public class JoinManyToManyMapValueTest extends AbstractTreatVariationsTest { public JoinManyToManyMapValueTest(String strategy, String objectPrefix) { diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java index df29feb71e..1c5f262efa 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyInverseSetTest.java @@ -5,7 +5,7 @@ package com.blazebit.persistence.testsuite.treat.builder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -16,7 +16,7 @@ // NOTE: Bug in ORM 6.3: https://hibernate.atlassian.net/browse/HHH-17385 @RunWith(Parameterized.class) -@Category({ NoHibernate60.class }) +@Category({ NoHibernate62.class }) public class JoinOneToManyInverseSetTest extends AbstractTreatVariationsTest { public JoinOneToManyInverseSetTest(String strategy, String objectPrefix) { diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java index 660a634813..e1125f68c9 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/builder/JoinOneToManyListTest.java @@ -5,7 +5,7 @@ package com.blazebit.persistence.testsuite.treat.builder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -16,7 +16,7 @@ // NOTE: Bug in ORM 6.3: https://hibernate.atlassian.net/browse/HHH-17385 @RunWith(Parameterized.class) -@Category({ NoHibernate60.class }) +@Category({ NoHibernate62.class }) public class JoinOneToManyListTest extends AbstractTreatVariationsTest { public JoinOneToManyListTest(String strategy, String objectPrefix) { diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java index 53420cf9b0..2b1e7651ea 100644 --- a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java +++ b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/treat/jpql/AbstractTreatVariationsTest.java @@ -6,11 +6,19 @@ package com.blazebit.persistence.testsuite.treat.jpql; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.experimental.categories.Category; +import org.junit.runners.MethodSorters; + import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.treat.entity.Base; import com.blazebit.persistence.testsuite.treat.entity.BaseEmbeddable; @@ -28,21 +36,12 @@ import com.blazebit.persistence.testsuite.treat.entity.TablePerClassSub1; import com.blazebit.persistence.testsuite.treat.entity.TablePerClassSub2; import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import org.junit.Assert; -import org.junit.FixMethodOrder; -import org.junit.experimental.categories.Category; -import org.junit.runners.MethodSorters; - import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; @FixMethodOrder(MethodSorters.NAME_ASCENDING) // NOTE: These tests are just for reference and have been copied and adapted form the jpa-treat-variations repository -@Category({ NoHibernate.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoHibernate.class, NoEclipselink.class }) public abstract class AbstractTreatVariationsTest extends AbstractCoreTest { protected final String strategy; diff --git a/entity-view/testsuite/pom.xml b/entity-view/testsuite/pom.xml index 4e8ea80b2b..f072adfa95 100644 --- a/entity-view/testsuite/pom.xml +++ b/entity-view/testsuite/pom.xml @@ -401,7 +401,7 @@ hibernate-6.2 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 @@ -494,6 +494,10 @@ org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + -AaddGeneratedAnnotation=false + @@ -502,7 +506,7 @@ hibernate-6.4 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64 @@ -606,7 +610,7 @@ true - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java index 091f1f8a88..5852eda5cd 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/array/ArrayFilteredCollectionsTest.java @@ -5,13 +5,15 @@ package com.blazebit.persistence.view.testsuite.array; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.ConfigurationProperties; import com.blazebit.persistence.view.EntityViewManager; @@ -23,12 +25,7 @@ import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsView; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static com.blazebit.persistence.view.testsuite.collections.subview.SubviewAssert.assertSubviewEquals; import static org.junit.Assert.assertEquals; @@ -106,10 +103,8 @@ public void setUp() { // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 - // NOTE: Entity joins are only supported on Hibernate 5.1+ @Test - @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoDB2.class, NoEclipselink.class }) public void testArrayExpression() { EntityViewConfiguration cfg = EntityViews.createDefaultConfiguration(); cfg.setProperty(ConfigurationProperties.PROXY_EAGER_LOADING, "true"); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java index 329264821b..43c066ae9f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/CreatableAbstractEntityTest.java @@ -4,7 +4,6 @@ */ package com.blazebit.persistence.view.testsuite.basic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable; import com.blazebit.persistence.testsuite.treat.entity.SingleTableBase; @@ -19,14 +18,11 @@ import com.blazebit.persistence.view.testsuite.basic.model.SingleTableBaseAbstractEntityMappingValidationView; import org.junit.Assert; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * @author Philipp Eder * @since 1.6.0 */ -// NOTE: DataNucleus -@Category({ NoDatanucleus.class }) public class CreatableAbstractEntityTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java index dd305cbbab..0765dc849f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EmbeddableTestEntityViewTest.java @@ -6,17 +6,13 @@ package com.blazebit.persistence.view.testsuite.basic; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.basic.model.EmbeddableTestEntityEmbeddableSubView; import com.blazebit.persistence.view.testsuite.basic.model.EmbeddableTestEntityIdView; @@ -48,9 +44,8 @@ * @since 1.0.6 */ // NOTE: Only Hibernate supports this mapping -//@Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class}) // NOTE: Hibernate 6.3.1 bug -@Category({NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate60.class}) +@Category({ NoEclipselink.class, NoHibernate62.class}) public class EmbeddableTestEntityViewTest extends AbstractEntityViewTest { protected EntityViewManager evm; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java index 2cbda202b2..36ef49dfca 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityFetchesTest.java @@ -5,37 +5,31 @@ package com.blazebit.persistence.view.testsuite.basic; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; +import com.blazebit.persistence.testsuite.entity.Document; +import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView1; -import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView3; import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView2; +import com.blazebit.persistence.view.testsuite.basic.model.FetchesDocumentView3; import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView1; -import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView3; import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView2; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.Person; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - +import com.blazebit.persistence.view.testsuite.basic.model.FetchesPersonView3; import jakarta.persistence.EntityManager; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * @@ -139,8 +133,6 @@ public void work(EntityManager em) { } @Test - // NOTE: Datanucleus doesn't seem to support fetching non-root relations - @Category({ NoDatanucleus.class }) public void entityViewFetchesInitializeEntitiesSimple() { CriteriaBuilder criteria = cbf.create(em, Person.class) .where("id").eq(pers1.getId()); @@ -205,8 +197,7 @@ public void entityViewFetchesInitializeEntitiesSimple() { @Test // NOTE: EclipseLink messes up the whole query result as soon as map values are selected... - // NOTE: Datanucleus doesn't seem to support fetching non-root relations - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void entityViewFetchesInitializeEntities() { CriteriaBuilder criteria = cbf.create(em, Person.class) .where("id").eq(pers1.getId()); @@ -279,9 +270,7 @@ public void entityViewFetchesInitializeEntities() { @Test // NOTE: EclipseLink messes up the whole query result as soon as map values are selected... - // NOTE: Element collection fetching of non-roots only got fixed in Hibernate 5.2.3: https://hibernate.atlassian.net/browse/HHH-11140 - // NOTE: Datanucleus doesn't seem to support fetching non-root relations - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void entityViewFetchesInitializeEntitiesWithElementCollections() { CriteriaBuilder criteria = cbf.create(em, Person.class) .where("id").eq(pers1.getId()); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java index d610a4765e..9b77ef50a1 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/EntityViewSettingTest.java @@ -5,38 +5,32 @@ package com.blazebit.persistence.view.testsuite.basic; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PagedList; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.Sorters; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.basic.model.CustomRootPersonView; import com.blazebit.persistence.view.testsuite.basic.model.DocumentWithEntityView; import com.blazebit.persistence.view.testsuite.basic.model.FilteredDocument; import com.blazebit.persistence.view.testsuite.basic.model.PersonView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @@ -198,12 +192,8 @@ public void testEntityViewFetches() { } @Test - @Category({ NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) - // We need a left entity join for this so Hibernate < 5.1 can't be used - // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates // EclipseLink doesn't support subqueries in functions which is required for LIMIT - // Datanucleus fails because of a NPE? - // OpenJPA has no function support + @Category({ NoEclipselink.class }) public void testEntityViewFetchesWithFilterAndSorter() { EntityViewManager evm = build(DocumentWithEntityView.class, PersonView.class); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java index ed1379098a..1b0fc7fa41 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/basic/PrimitiveViewTest.java @@ -4,9 +4,14 @@ */ package com.blazebit.persistence.view.testsuite.basic; +import java.util.Collections; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.PrimitiveDocument; import com.blazebit.persistence.testsuite.entity.PrimitivePerson; @@ -14,23 +19,17 @@ import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.metamodel.ViewType; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.basic.model.PrimitiveDocumentMultisetView; import com.blazebit.persistence.view.testsuite.basic.model.PrimitiveDocumentView; import com.blazebit.persistence.view.testsuite.basic.model.PrimitivePersonView; import com.blazebit.persistence.view.testsuite.basic.model.PrimitiveSimpleDocumentView; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.Collections; -import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; /** * @@ -154,9 +153,8 @@ public void testEntityViewSubviewFetches() { } // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testEntityViewMultisetSubviewFetches() { EntityViewManager evm = build( PrimitiveSimpleDocumentView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java index f4753f4dac..4d7b25b434 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/basic/BasicCollectionsTest.java @@ -5,17 +5,10 @@ package com.blazebit.persistence.view.testsuite.collections.basic; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.Collection; import java.util.List; -import jakarta.persistence.EntityManager; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -23,10 +16,10 @@ import org.junit.runners.Parameterized; import com.blazebit.persistence.CriteriaBuilder; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.basic.model.BasicDocumentCollectionsView; import com.blazebit.persistence.view.testsuite.collections.basic.model.BasicDocumentListMapSetView; @@ -37,6 +30,9 @@ import com.blazebit.persistence.view.testsuite.collections.basic.model.BasicDocumentSetMapListView; import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections; +import jakarta.persistence.EntityManager; + +import static org.junit.Assert.assertEquals; /** * @@ -129,9 +125,8 @@ public static Collection entityViewCombinations() { } @Test - // NOTE: DataNucleus renders joins wrong: https://github.com/datanucleus/datanucleus-rdbms/issues/177 // Eclipselink has a result set mapping bug in case of map keys - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void testCollections() { EntityViewManager evm = build(viewType); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java index a86c0c739b..cb645d91b8 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/extended/ExtendedEmbeddableCollectionsTest.java @@ -5,16 +5,10 @@ package com.blazebit.persistence.view.testsuite.collections.embeddable.extended; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.Collection; import java.util.List; -import jakarta.persistence.EntityManager; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -22,12 +16,11 @@ import org.junit.runners.Parameterized; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.embeddable.extended.model.ExtendedEmbeddableDocumentListMapSetView; import com.blazebit.persistence.view.testsuite.collections.embeddable.extended.model.ExtendedEmbeddableDocumentListSetMapView; @@ -38,6 +31,9 @@ import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentCollectionsView; import com.blazebit.persistence.view.testsuite.collections.entity.extended.ExtendedDocumentForElementCollections; import com.blazebit.persistence.view.testsuite.collections.entity.extended.ExtendedPersonForElementCollections; +import jakarta.persistence.EntityManager; + +import static org.junit.Assert.assertEquals; /** * @@ -129,8 +125,7 @@ public static Collection entityViewCombinations() { } @Test - // TODO: report that datanucleus doesn't support element collection in an embeddable - @Category({NoHibernate.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({NoHibernate.class, NoEclipselink.class }) // Eclipselink has a result set mapping bug in case of map keys public void testCollections() { EntityViewManager evm = build(viewType); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java index 18b947e345..5b47ef639c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/embeddable/simple/EmbeddableCollectionsTest.java @@ -5,16 +5,10 @@ package com.blazebit.persistence.view.testsuite.collections.embeddable.simple; -import static org.junit.Assert.assertEquals; - import java.util.Arrays; import java.util.Collection; import java.util.List; -import jakarta.persistence.EntityManager; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -22,12 +16,11 @@ import org.junit.runners.Parameterized; import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentCollectionsView; import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentListMapSetView; @@ -38,6 +31,9 @@ import com.blazebit.persistence.view.testsuite.collections.embeddable.simple.model.EmbeddableDocumentSetMapListView; import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForElementCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForElementCollections; +import jakarta.persistence.EntityManager; + +import static org.junit.Assert.assertEquals; /** * @@ -129,7 +125,7 @@ public static Collection entityViewCombinations() { } @Test - @Category({NoHibernate.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({NoHibernate.class, NoEclipselink.class }) // Eclipselink has a result set mapping bug in case of map keys public void testCollections() { EntityViewManager evm = build(viewType); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java index 338997e4de..d00b6da574 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/index/MappingIndexTest.java @@ -5,10 +5,16 @@ package com.blazebit.persistence.view.testsuite.collections.index; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Version; @@ -26,14 +32,7 @@ import com.blazebit.persistence.view.testsuite.collections.index.model.VersionKeyView; import com.blazebit.persistence.view.testsuite.collections.index.model.VersionStaticKeyView; import com.blazebit.persistence.view.testsuite.collections.index.model.VersionViewWithMappingIndex; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -81,7 +80,7 @@ public void testSelect() { @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSelectBatch2() { test(DocumentViewWithMappingIndexSelect.class, 2); } @@ -92,9 +91,8 @@ public void testSubselect() { } // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testMultiset() { test(DocumentViewWithMappingIndexMultiset.class); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java index f4abb7d10c..2fe8a857bf 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/EntityMapKeySubviewTest.java @@ -5,35 +5,29 @@ package com.blazebit.persistence.view.testsuite.collections.subview; +import java.util.List; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; +import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps; +import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; -import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps; -import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentCollectionsView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentForEntityKeyMapsView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForEntityKeyMapsView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewSimpleDocumentForEntityKeyMapsView; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @author Moritz Becker @@ -91,9 +85,6 @@ public void setUp() { * Test for https://github.com/Blazebit/blaze-persistence/issues/329 */ @Test - // NOTE: Hibernate 5.0 and lower don't work because of https://hibernate.atlassian.net/browse/HHH-10537 and https://hibernate.atlassian.net/browse/HHH-10577 - // NOTE: DataNucleus does not support this yet: https://github.com/datanucleus/datanucleus-core/issues/182 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class }) public void testCollections() { EntityViewManager evm = build( SubviewDocumentForEntityKeyMapsView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java index 5c74040dca..6e182fb5b7 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/MultisetFetchCollectionsTest.java @@ -5,37 +5,32 @@ package com.blazebit.persistence.view.testsuite.collections.subview; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections; import com.blazebit.persistence.view.testsuite.collections.subview.model.PersonForCollectionsMultisetFetchNestedView; -import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentCollectionsView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewDocumentMultisetFetchView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsMultisetFetchView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewSimpleDocumentMultisetFetchView; -import com.blazebit.persistence.view.testsuite.collections.subview.model.variations.PersonForCollectionsMasterView; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import java.util.Map; -import java.util.Set; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * @@ -102,9 +97,8 @@ public void setUp() { // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoDB2.class, NoEclipselink.class }) public void testCollections() { EntityViewManager evm = build( PersonForCollectionsMultisetFetchNestedView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java index 4c162c83e0..ab9706ae3e 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/collections/subview/SelectFetchNestedEmptyCollectionsTest.java @@ -5,13 +5,17 @@ package com.blazebit.persistence.view.testsuite.collections.subview; +import java.util.List; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections; @@ -21,16 +25,8 @@ import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsSelectFetchView; import com.blazebit.persistence.view.testsuite.collections.subview.model.SubviewPersonForCollectionsView; import com.blazebit.persistence.view.testsuite.collections.subview.model.variations.PersonForCollectionsMasterView; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import java.util.Set; -import static com.blazebit.persistence.view.testsuite.collections.subview.SubviewAssert.assertSubviewEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -89,8 +85,6 @@ public void setUp() { } @Test - // NOTE: DataNucleus doesn't like CASE WHEN ... THEN '' ELSE NULL END because NULL apparently has a different type for DN.. - @Category({ NoDatanucleus.class }) public void testCollections() { EntityViewManager evm = build( PersonForCollectionsSelectFetchNestedView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java index 931501bf13..f4810c9b00 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/batchsubselect/BatchSubselectSubsetCorrelationTest.java @@ -5,11 +5,15 @@ package com.blazebit.persistence.view.testsuite.correlation.batchsubselect; +import java.util.List; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; @@ -24,13 +28,7 @@ import com.blazebit.persistence.view.testsuite.entity.LegacyOrderPositionElement; import com.blazebit.persistence.view.testsuite.entity.LegacyOrderPositionEmbeddable; import com.blazebit.persistence.view.testsuite.entity.LegacyOrderPositionId; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import java.util.Set; /** * @@ -38,7 +36,7 @@ * @since 1.6.9 */ // NOTE: Requires values clause which currently is only available for Hibernate -@Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class BatchSubselectSubsetCorrelationTest extends AbstractEntityViewTest { @Override protected Class[] getEntityClasses() { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java index da91057fb3..03bf1446e2 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedded/EmbeddedCorrelationTest.java @@ -5,13 +5,11 @@ package com.blazebit.persistence.view.testsuite.correlation.embedded; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable; @@ -23,13 +21,8 @@ import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.correlation.embedded.model.EmbeddableTestEntityCorrelationView; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; /** @@ -66,10 +59,9 @@ public void work(EntityManager em) { } @Test // For #556 - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testEmbeddedCorrelation() { EntityViewManager evm = build( EmbeddableTestEntityCorrelationView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java index b10bbf86f5..78c02e5c84 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/embedding/EmbeddingViewRootCorrelationTest.java @@ -5,22 +5,20 @@ package com.blazebit.persistence.view.testsuite.correlation.embedding; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import com.blazebit.persistence.view.ConfigurationProperties; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.ConfigurationProperties; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.correlation.embedding.model.DocumentEmbeddingCorrelationView; import com.blazebit.persistence.view.testsuite.correlation.embedding.model.DocumentEmbeddingCorrelationViewJoinId; @@ -31,12 +29,7 @@ import com.blazebit.persistence.view.testsuite.correlation.embedding.model.DocumentEmbeddingCorrelationViewSubselectNormal; import com.blazebit.persistence.view.testsuite.correlation.embedding.model.SimpleDocumentEmbeddingCorrelatedView; import com.blazebit.persistence.view.testsuite.correlation.embedding.model.SimplePersonEmbeddingCorrelatedSubView; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -48,57 +41,47 @@ public class EmbeddingViewRootCorrelationTest extends AbstractEntityViewTest { @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationNormal() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, null); } @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationId() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, null); } @Test - // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize2() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, 2); } @Test - // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize2() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, 2); } @Test - // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize4() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, 4); } @Test - // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize4() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, 4); } @Test - // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize20() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryNormal.class, 20); } @Test - // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize20() { testCorrelation(DocumentEmbeddingCorrelationViewSubqueryId.class, 20); } @@ -117,17 +100,15 @@ public void testSubselectCorrelationId() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationNormal() { testCorrelation(DocumentEmbeddingCorrelationViewJoinNormal.class, null); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationId() { testCorrelation(DocumentEmbeddingCorrelationViewJoinId.class, null); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java index bdf57553b8..98372e5e25 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/expression/ExpressionCorrelationTest.java @@ -5,22 +5,17 @@ package com.blazebit.persistence.view.testsuite.correlation.expression; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PagedList; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.Sorters; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest; import com.blazebit.persistence.view.testsuite.correlation.expression.model.DocumentSimpleCorrelationViewJoinId; import com.blazebit.persistence.view.testsuite.correlation.expression.model.DocumentSimpleCorrelationViewSubqueryId; @@ -28,8 +23,6 @@ import com.blazebit.persistence.view.testsuite.correlation.model.SimpleDocumentCorrelatedView; import com.blazebit.persistence.view.testsuite.correlation.model.SimplePersonCorrelatedSubView; import com.blazebit.persistence.view.testsuite.correlation.model.SimpleVersionCorrelatedView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; @@ -41,56 +34,50 @@ public class ExpressionCorrelationTest extends AbstractCorrelationTest { @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationId() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, null); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize2() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize4() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize20() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 20); } @Test // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubselectCorrelationId() { testCorrelation(DocumentSimpleCorrelationViewSubselectId.class, null); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationId() { testCorrelation(DocumentSimpleCorrelationViewJoinId.class, null); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - // @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubselectCorrelationIdPaginated() { EntityViewManager evm = build( DocumentSimpleCorrelationViewSubselectId.class, @@ -111,11 +98,9 @@ public void testSubselectCorrelationIdPaginated() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testFilterSortJoinCorrelatedSingularViewPaginated() { EntityViewManager evm = buildEntityViewManagerForFilter(); @@ -133,11 +118,9 @@ public void testFilterSortJoinCorrelatedSingularViewPaginated() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testFilterSortJoinCorrelatedPluralViewPaginated() { EntityViewManager evm = buildEntityViewManagerForFilter(); @@ -155,11 +138,9 @@ public void testFilterSortJoinCorrelatedPluralViewPaginated() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testFilterSortJoinCorrelatedSingularBasicPaginated() { EntityViewManager evm = buildEntityViewManagerForFilter(); @@ -177,11 +158,9 @@ public void testFilterSortJoinCorrelatedSingularBasicPaginated() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testFilterSortJoinCorrelatedPluralBasicPaginated() { EntityViewManager evm = buildEntityViewManagerForFilter(); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java index d481d16108..5d687322d1 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/general/GeneralCorrelationTest.java @@ -5,13 +5,10 @@ package com.blazebit.persistence.view.testsuite.correlation.general; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest; import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewJoinId; import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewJoinNormal; @@ -19,8 +16,6 @@ import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewSubqueryNormal; import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewSubselectId; import com.blazebit.persistence.view.testsuite.correlation.general.model.DocumentCorrelationViewSubselectNormal; -import org.junit.Test; -import org.junit.experimental.categories.Category; /** * @@ -30,57 +25,53 @@ public class GeneralCorrelationTest extends AbstractCorrelationTest { @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationNormal() { testCorrelation(DocumentCorrelationViewSubqueryNormal.class, null); } @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationId() { testCorrelation(DocumentCorrelationViewSubqueryId.class, null); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize2() { testCorrelation(DocumentCorrelationViewSubqueryNormal.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize2() { testCorrelation(DocumentCorrelationViewSubqueryId.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize4() { testCorrelation(DocumentCorrelationViewSubqueryNormal.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize4() { testCorrelation(DocumentCorrelationViewSubqueryId.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize20() { testCorrelation(DocumentCorrelationViewSubqueryNormal.class, 20); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize20() { testCorrelation(DocumentCorrelationViewSubqueryId.class, 20); } @@ -99,17 +90,15 @@ public void testSubselectCorrelationId() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationNormal() { testCorrelation(DocumentCorrelationViewJoinNormal.class, null); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationId() { testCorrelation(DocumentCorrelationViewJoinId.class, null); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java index dc27f1800c..d5c21fc146 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/joinable/JoinableCorrelationTest.java @@ -5,23 +5,17 @@ package com.blazebit.persistence.view.testsuite.correlation.joinable; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.correlation.joinable.model.DocumentJoinableCorrelationView; import com.blazebit.persistence.view.testsuite.correlation.model.SimplePersonCorrelatedSubView; -import org.junit.Test; -import org.junit.experimental.categories.Category; /** * @@ -31,10 +25,9 @@ public class JoinableCorrelationTest extends AbstractEntityViewTest { @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinableCorrelation() { EntityViewManager evm = build( DocumentJoinableCorrelationView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java index 4f30b68607..cb11c9939c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/nestedjoin/JoinableCorrelationTest.java @@ -5,25 +5,18 @@ package com.blazebit.persistence.view.testsuite.correlation.nestedjoin; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; -import com.blazebit.persistence.view.testsuite.correlation.model.SimplePersonCorrelatedSubView; import com.blazebit.persistence.view.testsuite.correlation.nestedjoin.model.DocumentNestedJoinView; import com.blazebit.persistence.view.testsuite.correlation.nestedjoin.model.PersonNestedJoinSubView; import com.blazebit.persistence.view.testsuite.correlation.nestedjoin.model.SimpleDocumentView; -import org.junit.Test; -import org.junit.experimental.categories.Category; /** * @@ -32,11 +25,10 @@ */ public class JoinableCorrelationTest extends AbstractEntityViewTest { - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testNestedJoinCorrelation() { EntityViewManager evm = build( DocumentNestedJoinView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java index 9437d8c13b..99034e207f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/correlation/simple/SimpleCorrelationTest.java @@ -5,13 +5,10 @@ package com.blazebit.persistence.view.testsuite.correlation.simple; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.view.testsuite.correlation.AbstractCorrelationTest; import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewJoinId; import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewJoinNormal; @@ -19,8 +16,6 @@ import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewSubqueryNormal; import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewSubselectId; import com.blazebit.persistence.view.testsuite.correlation.simple.model.DocumentSimpleCorrelationViewSubselectNormal; -import org.junit.Test; -import org.junit.experimental.categories.Category; /** * @@ -30,57 +25,53 @@ public class SimpleCorrelationTest extends AbstractCorrelationTest { @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationNormal() { testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, null); } @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryCorrelationId() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, null); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize2() { testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize2() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize4() { testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize4() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationNormalSize20() { testCorrelation(DocumentSimpleCorrelationViewSubqueryNormal.class, 20); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize20() { testCorrelation(DocumentSimpleCorrelationViewSubqueryId.class, 20); } @@ -99,17 +90,15 @@ public void testSubselectCorrelationId() { } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationNormal() { testCorrelation(DocumentSimpleCorrelationViewJoinNormal.class, null); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinCorrelationId() { testCorrelation(DocumentSimpleCorrelationViewJoinId.class, null); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java index 2174ae9bfc..33367dd723 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/cte/WithCTEMappingTest.java @@ -7,13 +7,12 @@ import java.util.List; -import jakarta.persistence.EntityManager; - -import com.blazebit.persistence.testsuite.base.jpa.category.*; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.blazebit.persistence.CriteriaBuilder; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.Person; @@ -22,9 +21,7 @@ import com.blazebit.persistence.view.CTEProvider; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.metamodel.ManagedViewType; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.cte.model.DocumentOwnersCTE; import com.blazebit.persistence.view.testsuite.cte.model.DocumentWithCTE; @@ -32,9 +29,11 @@ import com.blazebit.persistence.view.testsuite.cte.model.PersonWithPartnerDocumentFullAged; import com.blazebit.persistence.view.testsuite.cte.model.PersonWithPartnerDocumentFullAged.FullAgedCTEProvider; import com.blazebit.persistence.view.testsuite.cte.model.PersonWithPartnerDocumentUnderAged; -import org.junit.experimental.categories.Category; +import jakarta.persistence.EntityManager; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -42,8 +41,7 @@ * @since 1.4.0 */ // NOTE: Uses CTEs and entity joins, so only works for a few combinations -// NOTE: H2 before 1.4.199 does something weird again when join correlating a CTE.. -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) +@Category({ NoEclipselink.class }) public class WithCTEMappingTest extends AbstractEntityViewTest { private Document doc1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java index 11de64dafc..25ecfec2fb 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/embedded/EmbeddedFetchTest.java @@ -5,24 +5,24 @@ package com.blazebit.persistence.view.testsuite.fetch.embedded; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import com.blazebit.persistence.view.ConfigurationProperties; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.ConfigurationProperties; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.entity.EmbeddableTestEntity2; import com.blazebit.persistence.view.testsuite.entity.EmbeddableTestEntityEmbeddable2; @@ -40,15 +40,7 @@ import com.blazebit.persistence.view.testsuite.fetch.embedded.model.EmbeddableTestEntitySimpleFetchView; import com.blazebit.persistence.view.testsuite.fetch.embedded.model.IntIdEntityFetchSubView; import com.blazebit.persistence.view.testsuite.fetch.embedded.model.IntIdEntitySimpleSubView; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * Test for #601 @@ -60,7 +52,7 @@ // NOTE: Element collection fetching of non-roots only got fixed in Hibernate 5.2.3: https://hibernate.atlassian.net/browse/HHH-11140 //@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class }) // NOTE: Hibernate 6.3.1 bug -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoHibernate60.class }) +@Category({ NoEclipselink.class, NoHibernate62.class }) public class EmbeddedFetchTest extends AbstractEntityViewTest { protected EmbeddableTestEntity2 doc1; @@ -148,91 +140,83 @@ public void setUp() { } @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryFetchEntity() { testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedEntitySize2() { testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedEntitySize4() { testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedEntitySize20() { testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubquery.class, 20); } @Test // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubselectFetchEntity() { testCorrelation(EmbeddableTestEntityFetchAsEntityViewSubselect.class); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinFetchEntity() { testCorrelation(EmbeddableTestEntityFetchAsEntityViewJoin.class); } @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryFetchView() { testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedViewSize2() { testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedViewSize4() { testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedViewSize20() { testCorrelation(EmbeddableTestEntityFetchAsViewViewSubquery.class, 20); } @Test // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubselectFetchView() { testCorrelation(EmbeddableTestEntityFetchAsViewViewSubselect.class); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - // @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinFetchView() { testCorrelation(EmbeddableTestEntityFetchAsViewViewJoin.class); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java index 5b2668b6e6..fef4896555 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/multiset/MultisetFetchTypeTest.java @@ -14,7 +14,6 @@ import java.time.ZoneOffset; import java.util.List; import java.util.Set; -import jakarta.persistence.EntityManager; import org.junit.Assert; import org.junit.Before; @@ -23,12 +22,7 @@ import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; @@ -37,6 +31,7 @@ import com.blazebit.persistence.view.testsuite.fetch.multiset.model.PersonMultisetFetchView; import com.blazebit.persistence.view.testsuite.timeentity.DocumentForMultisetFetch; import com.blazebit.persistence.view.testsuite.timeentity.PersonForMultisetFetch; +import jakarta.persistence.EntityManager; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -117,10 +112,8 @@ public void setUp() { // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 - // NOTE: Java 8 time types are only supported as of Hibernate 5.2 @Test - @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class }) + @Category({ NoDB2.class, NoEclipselink.class }) public void testCollections() { EntityViewManager evm = build( PersonMultisetFetchView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java index 5d66fc4124..e0f40b2a34 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/normal/simple/SimpleFetchTest.java @@ -5,19 +5,14 @@ package com.blazebit.persistence.view.testsuite.fetch.normal.simple; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.view.testsuite.fetch.normal.AbstractFetchTest; import com.blazebit.persistence.view.testsuite.fetch.normal.simple.model.DocumentSimpleFetchViewJoin; import com.blazebit.persistence.view.testsuite.fetch.normal.simple.model.DocumentSimpleFetchViewSubquery; import com.blazebit.persistence.view.testsuite.fetch.normal.simple.model.DocumentSimpleFetchViewSubselect; -import org.junit.Test; -import org.junit.experimental.categories.Category; /** * @@ -27,46 +22,42 @@ public class SimpleFetchTest extends AbstractFetchTest { @Test - // NOTE: Datenucleus issue: https://github.com/datanucleus/datanucleus-api-jpa/issues/77 - @Category({ NoDatanucleus.class }) public void testSubqueryFetch() { testCorrelation(DocumentSimpleFetchViewSubquery.class); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize2() { testCorrelation(DocumentSimpleFetchViewSubquery.class, 2); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus4.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize4() { testCorrelation(DocumentSimpleFetchViewSubquery.class, 4); } @Test // NOTE: Requires values clause which currently is only available for Hibernate - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class}) + @Category({ NoEclipselink.class}) public void testSubqueryBatchedCorrelationIdSize20() { testCorrelation(DocumentSimpleFetchViewSubquery.class, 20); } @Test // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubselectFetch() { testCorrelation(DocumentSimpleFetchViewSubselect.class); } @Test - // NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink renders a cross join at the wrong position in the SQL // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus4.class, NoOpenJPA.class, NoEclipselink.class }) - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testJoinFetch() { testCorrelation(DocumentSimpleFetchViewJoin.class); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java index a14431f77a..c3902606ee 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/fetch/subview/SubviewFetchTest.java @@ -5,28 +5,25 @@ package com.blazebit.persistence.view.testsuite.fetch.subview; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.Sorters; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.fetch.subview.model.DocumentSelectSubviewTestView; import com.blazebit.persistence.view.testsuite.fetch.subview.model.DocumentSubselectSubviewTestView; import com.blazebit.persistence.view.testsuite.fetch.subview.model.PersonSelectSubview; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -70,7 +67,7 @@ public void setUp() { @Test // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubqueryFetchOptional() { EntityViewManager evm = build( DocumentSelectSubviewTestView.class, @@ -87,7 +84,7 @@ public void testSubqueryFetchOptional() { @Test // NOTE: Eclipselink and Datanucleus don't support the single valued id access optimization which causes a cyclic join dependency - @Category({ NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void testSubselectFetchWithSorter() { EntityViewManager evm = build(DocumentSubselectSubviewTestView.class); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java index 94641fe3da..fdee1ddafe 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/filter/inheritance/AttributeFilterTest.java @@ -5,26 +5,23 @@ package com.blazebit.persistence.view.testsuite.filter.inheritance; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.entity.PrimitiveDocument; import com.blazebit.persistence.testsuite.entity.PrimitivePerson; import com.blazebit.persistence.testsuite.entity.PrimitiveVersion; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.filter.inheritance.model.AttributeFilterInheritancePrimitiveDocumentView; import com.blazebit.persistence.view.testsuite.filter.inheritance.model.AttributeFilterInheritancePrimitiveDocumentViewSub1; import com.blazebit.persistence.view.testsuite.filter.inheritance.model.AttributeFilterInheritancePrimitiveDocumentViewSub2; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -82,8 +79,6 @@ public void setUp() { } @Test - // DataNucleus apparently thinks NULL has a specific type which isn't the one of other result arms of a CASE WHEN clause - @Category({ NoDatanucleus.class }) public void testAttributeFilterWithInheritance() { EntityViewManager evm = build( AttributeFilterInheritancePrimitiveDocumentView.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java index 1c8669d1a5..b431151846 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/flat/UpdatableFlatViewTest.java @@ -5,7 +5,12 @@ package com.blazebit.persistence.view.testsuite.flat; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; @@ -13,21 +18,16 @@ import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityView; import com.blazebit.persistence.view.EntityViewManager; -import com.blazebit.persistence.view.EntityViewSetting; import com.blazebit.persistence.view.FetchStrategy; import com.blazebit.persistence.view.IdMapping; import com.blazebit.persistence.view.Mapping; import com.blazebit.persistence.view.UpdatableEntityView; import com.blazebit.persistence.view.UpdatableMapping; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; /** * @@ -91,9 +91,8 @@ public void querySubselect() { } // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void queryMultiset() { test(UpdatableDocumentWithMapsMultisetView.class); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java index b0a336152b..ed1b296e61 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/basic/InheritanceTest.java @@ -5,18 +5,24 @@ package com.blazebit.persistence.view.testsuite.inheritance.basic; +import java.sql.Timestamp; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import com.blazebit.persistence.testsuite.entity.Document; +import com.blazebit.persistence.testsuite.entity.Person; +import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.metamodel.ManagedViewType; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.Person; -import com.blazebit.persistence.testsuite.entity.Version; import com.blazebit.persistence.view.testsuite.inheritance.basic.model.DocumentBaseView; import com.blazebit.persistence.view.testsuite.inheritance.basic.model.NewDocumentView; import com.blazebit.persistence.view.testsuite.inheritance.basic.model.NewSub1DocumentView; @@ -27,18 +33,13 @@ import com.blazebit.persistence.view.testsuite.inheritance.basic.model.UnusedOldDocumentView; import com.blazebit.persistence.view.testsuite.inheritance.basic.model.UsedOldDocumentView; import com.blazebit.persistence.view.testsuite.inheritance.basic.model.UsedOldSub1DocumentView; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.sql.Timestamp; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -212,8 +213,6 @@ public void inheritanceMetamodel() { } @Test - // TODO: report that datanucleus thinks a NULL literal is of type Integer and normal integral literals are of type Long - @Category({ NoDatanucleus.class }) public void inheritanceQuery() { CriteriaBuilder criteria = cbf.create(em, Document.class, "d") .orderByAsc("id"); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java index a0f04a6c65..5a48b30b2b 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/embedded/EmbeddedInheritanceTest.java @@ -5,8 +5,13 @@ package com.blazebit.persistence.view.testsuite.inheritance.embedded; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable; @@ -19,25 +24,17 @@ import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.metamodel.ManagedViewType; import com.blazebit.persistence.view.metamodel.SingularAttribute; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.IntIdEntityView; import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableDetailsView; import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableSub1DetailsView; import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableSub2DetailsView; import com.blazebit.persistence.view.testsuite.inheritance.embedded.model.SingleTableView; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; /** @@ -46,7 +43,7 @@ * @since 1.2.0 */ // NOTE: Eclipselink and Datanucleus have no real support for subtype property access -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class EmbeddedInheritanceTest extends AbstractEntityViewTest { private SingleTableSub1 base1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java index a984378dd3..fc4e62a9e4 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/nested/PolymorphicNestedInheritanceTest.java @@ -5,8 +5,13 @@ package com.blazebit.persistence.view.testsuite.inheritance.nested; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable; @@ -19,20 +24,13 @@ import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableBaseView; import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableChildView; import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableNormalView; import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableSub1View; import com.blazebit.persistence.view.testsuite.inheritance.nested.model.SingleTableSub2View; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -42,7 +40,7 @@ * @since 1.2.0 */ // NOTE: Eclipselink and Datanucleus have no real support for subtype property access -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class PolymorphicNestedInheritanceTest extends AbstractEntityViewTest { private SingleTableSub1 base1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java index bb7c2792c6..23143abc04 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/InheritanceMappingInAnotherEntityViewTest.java @@ -5,17 +5,30 @@ package com.blazebit.persistence.view.testsuite.inheritance.polymorphic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import com.blazebit.persistence.view.*; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; -import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import jakarta.persistence.*; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import com.blazebit.persistence.view.EntityView; +import com.blazebit.persistence.view.EntityViewInheritance; +import com.blazebit.persistence.view.EntityViewManager; +import com.blazebit.persistence.view.EntityViewSetting; +import com.blazebit.persistence.view.IdMapping; +import com.blazebit.persistence.view.Mapping; +import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import static org.junit.Assert.assertTrue; @@ -24,7 +37,7 @@ * @author Jan-Willem Gmelig Meyling * @since 1.2.0 */ -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class InheritanceMappingInAnotherEntityViewTest extends AbstractEntityViewTest { private EntityViewManager evm; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java index 242cb31e0d..ea86ed7150 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/MultiLevelViewInheritanceTest.java @@ -5,17 +5,27 @@ package com.blazebit.persistence.view.testsuite.inheritance.polymorphic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import com.blazebit.persistence.view.*; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; -import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import jakarta.persistence.*; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import com.blazebit.persistence.view.EntityView; +import com.blazebit.persistence.view.EntityViewInheritance; +import com.blazebit.persistence.view.EntityViewManager; +import com.blazebit.persistence.view.EntityViewSetting; +import com.blazebit.persistence.view.IdMapping; +import com.blazebit.persistence.view.Mapping; +import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.Table; import static org.junit.Assert.assertTrue; @@ -24,7 +34,7 @@ * @author Jan-Willem Gmelig Meyling * @since 1.2.0 */ -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class MultiLevelViewInheritanceTest extends AbstractEntityViewTest { private EntityViewManager evm; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java index 4b2affb79f..bda508e400 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/NestedInheritanceMappingTest.java @@ -5,17 +5,30 @@ package com.blazebit.persistence.view.testsuite.inheritance.polymorphic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.tx.TxVoidWork; -import com.blazebit.persistence.view.*; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; -import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import jakarta.persistence.*; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.tx.TxVoidWork; +import com.blazebit.persistence.view.EntityView; +import com.blazebit.persistence.view.EntityViewInheritance; +import com.blazebit.persistence.view.EntityViewManager; +import com.blazebit.persistence.view.EntityViewSetting; +import com.blazebit.persistence.view.IdMapping; +import com.blazebit.persistence.view.Mapping; +import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import static org.junit.Assert.assertTrue; @@ -24,7 +37,7 @@ * @author Jan-Willem Gmelig Meyling * @since 1.2.0 */ -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class NestedInheritanceMappingTest extends AbstractEntityViewTest { private EntityViewManager evm; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java index ca3a21c8a9..1db9575dda 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/polymorphic/PolymorphicInheritanceTest.java @@ -5,8 +5,13 @@ package com.blazebit.persistence.view.testsuite.inheritance.polymorphic; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.treat.entity.IntValueEmbeddable; @@ -19,9 +24,7 @@ import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.metamodel.ManagedViewType; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableBaseView; import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSimpleBaseView; @@ -29,12 +32,7 @@ import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSimpleSub2View; import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSub1View; import com.blazebit.persistence.view.testsuite.inheritance.polymorphic.model.SingleTableSub2View; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -46,7 +44,7 @@ * @since 1.2.0 */ // NOTE: Eclipselink and Datanucleus have no real support for subtype property access -@Category({ NoEclipselink.class, NoDatanucleus.class }) +@Category({ NoEclipselink.class }) public class PolymorphicInheritanceTest extends AbstractEntityViewTest { private SingleTableSub1 base1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java index 39d950fbb7..83861de4be 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/correlated/CorrelatedSubviewInheritanceTest.java @@ -5,23 +5,22 @@ package com.blazebit.persistence.view.testsuite.inheritance.subview.correlated; +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus4; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; import com.blazebit.persistence.testsuite.base.jpa.category.NoMSSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.DocumentView; import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.DocumentView1; @@ -41,13 +40,7 @@ import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.YoungPersonView2; import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.YoungPersonView3; import com.blazebit.persistence.view.testsuite.inheritance.subview.correlated.model.YoungPersonView4; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -122,22 +115,21 @@ public void setUp() { } @Test - // NOTE: Hibernate only supports entity joins from 5.1 onwards // NOTE: EclipseLink fails to handle the query because the ON clause contains function expressions CONCAT - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoEclipselink.class, NoDatanucleus4.class, NoMSSQL.class }) + @Category({ NoEclipselink.class, NoMSSQL.class }) public void inheritanceQueryJoined() { inheritanceQuery(DocumentView1.class, PersonBaseView1.class, OldPersonView1.class, YoungPersonView1.class); } @Test // NOTE: EclipseLink fails to handle the query because the ON clause contains function expressions CONCAT - @Category({ NoEclipselink.class, NoDatanucleus4.class, NoMSSQL.class }) + @Category({ NoEclipselink.class, NoMSSQL.class }) public void inheritanceQuerySubselect() { inheritanceQuery(DocumentView2.class, PersonBaseView2.class, OldPersonView2.class, YoungPersonView2.class); } @Test - @Category({ NoDatanucleus4.class, NoMSSQL.class }) + @Category({ NoMSSQL.class }) public void inheritanceQuerySelect() { inheritanceQuery(DocumentView3.class, PersonBaseView3.class, OldPersonView3.class, YoungPersonView3.class); } @@ -145,7 +137,7 @@ public void inheritanceQuerySelect() { @Test // NOTE: This required the VALUES clause which is only supported for Hibernate for now // NOTE: For Oracle, we use to_clob in VALUES for cast_string which is problematic - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class, NoMSSQL.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoMSSQL.class, NoOracle.class }) public void inheritanceQuerySelectBatch() { inheritanceQuery(DocumentView4.class, PersonBaseView4.class, OldPersonView4.class, YoungPersonView4.class); } diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java index 1f9273074e..7a5de6c6b5 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/inheritance/subview/simple/SubviewInheritanceTest.java @@ -5,17 +5,21 @@ package com.blazebit.persistence.view.testsuite.inheritance.subview.simple; +import java.util.List; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import com.blazebit.persistence.testsuite.entity.Document; +import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; -import com.blazebit.persistence.testsuite.entity.Document; -import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView1; +import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView2; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView3; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.OldPersonView1; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.OldPersonView2; @@ -26,17 +30,10 @@ import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.PersonBaseView3; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.SimpleDocumentView; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.SimplePersonSubView; -import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.DocumentView2; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.YoungPersonView1; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.YoungPersonView2; import com.blazebit.persistence.view.testsuite.inheritance.subview.simple.model.YoungPersonView3; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -267,8 +264,6 @@ public void inheritanceQuerySubviewInheritanceMapping() { } @Test - // TODO: report that datanucleus thinks a NULL literal is of type Integer and normal integral literals are of type Long - @Category({ NoDatanucleus.class }) public void inheritanceQuerySubviewInheritanceMappingWithoutBaseType() { this.evm = build( DocumentView3.class, diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java index 296b955492..4f4984ef04 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/limit/LimitTest.java @@ -5,24 +5,19 @@ package com.blazebit.persistence.view.testsuite.limit; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.ConfigurationProperties; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.limit.model.DocumentLimitView; import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitJoinExpressionView; @@ -31,11 +26,7 @@ import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitSelectView; import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitSubselectView; import com.blazebit.persistence.view.testsuite.limit.model.PersonLimitView; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -69,41 +60,30 @@ public void work(EntityManager em) { } @Test -// @Category({ NoMySQLOld.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) - // MySQL before 8 didn't support lateral joins which are required here // EclipseLink, Datanucleus and OpenJPA don't support extended SQL // NOTE: Hibernate 6.3 bug: https://hibernate.atlassian.net/browse/HHH-17386 - @Category({ NoMySQLOld.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class, NoHibernate60.class }) + @Category({ NoEclipselink.class, NoHibernate62.class }) public void testLimitMultiset() { test(PersonLimitMultisetView.class, null); } @Test - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) - // We need a left entity join for this so Hibernate < 5.1 can't be used - // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates // EclipseLink doesn't support subqueries in functions which is required for LIMIT - // Datanucleus fails because of a NPE? - // OpenJPA has no function support + @Category({ NoEclipselink.class }) public void testLimitJoin() { test(PersonLimitJoinView.class, null); } @Test -// @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) - // We need a left entity join for this so Hibernate < 5.1 can't be used - // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates // EclipseLink doesn't support subqueries in functions which is required for LIMIT - // Datanucleus fails because of a NPE? - // OpenJPA has no function support // NOTE: Hibernate 6.3 bug: https://hibernate.atlassian.net/browse/HHH-17386 - @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class, NoHibernate60.class }) + @Category({ NoEclipselink.class, NoHibernate62.class }) public void testLimitJoinExpression() { test(PersonLimitJoinExpressionView.class, null); } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // EclipseLink doesn't support subqueries in functions which is required for LIMIT // Datanucleus fails because of a NPE? // OpenJPA has no function support @@ -112,7 +92,7 @@ public void testLimitSelectBatch1() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates // EclipseLink doesn't support subqueries in functions which is required for LIMIT // Datanucleus fails because of a NPE? @@ -122,7 +102,7 @@ public void testLimitSelectBatch2() { } @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // MySQL before 8 didn't support lateral and also don't support correlated LIMIT subqueries in quantified predicates // EclipseLink doesn't support subqueries in functions which is required for LIMIT // Datanucleus fails because of a NPE? diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java index c04b44cf7f..5b0e1a8bd7 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/multiset/MultisetFetchCollectionsBenchmarkTest.java @@ -5,16 +5,26 @@ package com.blazebit.persistence.view.testsuite.multiset; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.TestRule; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.base.jpa.MutablePersistenceUnitInfo; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections; @@ -30,19 +40,7 @@ import com.blazebit.persistence.view.testsuite.multiset.model.multiset.SubviewPersonForCollectionsMultisetFetchViewMultiset; import com.carrotsearch.junitbenchmarks.BenchmarkOptions; import com.carrotsearch.junitbenchmarks.BenchmarkRule; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.TestRule; - import jakarta.persistence.EntityManager; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; import static org.junit.Assert.assertEquals; @@ -146,9 +144,8 @@ public void setUp() { // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoDB2.class, NoEclipselink.class }) @BenchmarkOptions(benchmarkRounds = 5, warmupRounds = 4) public void testJoinFetch() { testCollections(joinEvm, PersonForCollectionsMultisetFetchNestedViewJoin.class); @@ -156,9 +153,8 @@ public void testJoinFetch() { // NOTE: DB2 crashes when executing this test with the GROUP_CONCAT based implementation // NOTE: EclipseLink can't handle multiple subquery select items... Only one expression can be declared in a SELECT clause of a subquery - // NOTE: DataNucleus can't handle multiple subquery select items... Number of result expressions in subquery should be 1 @Test - @Category({ NoDB2.class, NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoDB2.class, NoEclipselink.class }) @BenchmarkOptions(benchmarkRounds = 5, warmupRounds = 4) public void testMultisetFetch() { testCollections(multisetEvm, PersonForCollectionsMultisetFetchNestedViewMultiset.class); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java index f63f3784ef..3a52f0e2ab 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/AggregateViewPaginationTest.java @@ -5,9 +5,13 @@ package com.blazebit.persistence.view.testsuite.pagination; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; @@ -16,13 +20,7 @@ import com.blazebit.persistence.view.Sorters; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.pagination.model.DocumentAggregationView; -import com.blazebit.persistence.view.testsuite.pagination.model.DocumentViewInterface; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -31,8 +29,6 @@ * @author Christian Beikov * @since 1.6.0 */ -// NOTE: DataNucleus apparently only allows `MAX(fieldReference)` but we use `MAX(1)` for type resolving internally -@Category({ NoDatanucleus.class }) public class AggregateViewPaginationTest extends AbstractEntityViewTest { protected EntityViewManager evm; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java index 2c1895225a..22a663fa8a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/pagination/PaginationTest.java @@ -5,10 +5,15 @@ package com.blazebit.persistence.view.testsuite.pagination; +import java.util.List; +import java.util.Set; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.PaginatedCriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; @@ -20,13 +25,7 @@ import com.blazebit.persistence.view.Sorters; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.basic.model.IdHolderView; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; -import java.util.Set; import static org.junit.Assert.assertEquals; @@ -74,7 +73,7 @@ public void setUp() { private Document doc1; @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) // TODO: report eclipselink does not support subqueries in functions public void testPagination() { EntityViewSetting> settings = EntityViewSetting.create(DocumentViewInterface.class, 0, 1) diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java index fa3baaeb84..4a15682a61 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/predicated/basic/BasicPredicatedTest.java @@ -5,24 +5,22 @@ package com.blazebit.persistence.view.testsuite.predicated.basic; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.collections.entity.simple.DocumentForCollections; import com.blazebit.persistence.view.testsuite.collections.entity.simple.PersonForCollections; import com.blazebit.persistence.view.testsuite.predicated.basic.model.BasicPredicatedDocumentCollectionsView; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -106,9 +104,8 @@ public void setUp() { } @Test - // NOTE: DataNucleus renders joins wrong: https://github.com/datanucleus/datanucleus-rdbms/issues/177 // Apparently EclipseLink just ignores any ON conditions when having join tables... - @Category({ NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class }) public void multipleBasicPredicatedCollectionsAreFetchedCorrectly() { EntityViewManager evm = build(BasicPredicatedDocumentCollectionsView.class); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java index 71c01e5aec..7467410164 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/proxy/ProxyFactoryEmeddableTest.java @@ -5,7 +5,11 @@ package com.blazebit.persistence.view.testsuite.proxy; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.Collections; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable; @@ -14,9 +18,9 @@ import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntitySub; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.NameObject; +import com.blazebit.persistence.view.ConfigurationProperties; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.ConfigurationProperties; import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.basic.model.IntIdEntityView; @@ -27,20 +31,18 @@ import com.blazebit.persistence.view.testsuite.proxy.model.UpdatableEmbeddableTestEntityNestedEmbeddableView; import com.blazebit.persistence.view.testsuite.proxy.model.UpdatableEmbeddableTestEntityView; import com.blazebit.persistence.view.testsuite.proxy.model.UpdatableNameObjectView; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.util.Collections; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class ProxyFactoryEmeddableTest extends AbstractEntityViewTest { @Override diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java index ec4a516c8c..aca786a092 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/subview/MapKeySubviewTest.java @@ -5,25 +5,20 @@ package com.blazebit.persistence.view.testsuite.subview; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.tx.TxVoidWork; import com.blazebit.persistence.view.EntityView; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.IdMapping; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; import jakarta.persistence.Id; @@ -32,8 +27,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MapKey; import jakarta.persistence.Table; -import java.util.HashMap; -import java.util.Map; import static org.junit.Assert.assertEquals; @@ -44,7 +37,7 @@ * @author Moritz Becker * @since 1.4.0 */ -@Category({NoDatanucleus.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate50.class, NoHibernate51.class, NoEclipselink.class, NoOracle.class, NoDB2.class})//Ignore DB2 until https://hibernate.atlassian.net/browse/HHH-15523 is fixed +@Category({ NoEclipselink.class, NoOracle.class}) public class MapKeySubviewTest extends AbstractEntityViewTest { private MapKeySubviewTest.MapContainer container; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java index aaad185032..269946e142 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicCollectionsTest.java @@ -5,17 +5,17 @@ package com.blazebit.persistence.view.testsuite.update.basic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.ArrayList; + +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateDocumentTest; import com.blazebit.persistence.view.testsuite.update.basic.model.UpdatableDocumentBasicWithCollectionsViewBase; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.ArrayList; /** * @@ -23,8 +23,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateBasicCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public AbstractEntityViewUpdateBasicCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java index e24f01e19d..e0dbabe56a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicMapsTest.java @@ -5,17 +5,17 @@ package com.blazebit.persistence.view.testsuite.update.basic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.HashMap; + +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateDocumentTest; import com.blazebit.persistence.view.testsuite.update.basic.model.UpdatableDocumentBasicWithMapsViewBase; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.HashMap; /** * @@ -23,8 +23,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateBasicMapsTest extends AbstractEntityViewUpdateDocumentTest { public AbstractEntityViewUpdateBasicMapsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java index b68c297521..ee1a53f2b1 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/AbstractEntityViewUpdateBasicTest.java @@ -5,17 +5,17 @@ package com.blazebit.persistence.view.testsuite.update.basic; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import java.util.Date; + +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateDocumentTest; import com.blazebit.persistence.view.testsuite.update.basic.model.UpdatableDocumentBasicViewBase; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Date; /** * @@ -23,8 +23,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateBasicTest extends AbstractEntityViewUpdateDocumentTest { public AbstractEntityViewUpdateBasicTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java index 3b5c68b736..bc0a3c2f83 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicCollectionsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.creatable; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.creatable.model.UpdatableDocumentBasicWithCollectionsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableBasicCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java index 37f6f99106..a4d8df42c0 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicMapsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.creatable; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.creatable.model.UpdatableDocumentBasicWithMapsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableBasicMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java index 74b4fddbaa..71cae629ff 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatable/EntityViewUpdateCreatableBasicTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.creatable; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.creatable.model.UpdatableDocumentBasicView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableBasicTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java index a2e4fb810f..5af68f88d3 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicCollectionsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.creatableonly.model.UpdatableDocumentBasicWithCollectionsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyBasicCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java index 3b796cfe94..9b151a653b 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicMapsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.creatableonly.model.UpdatableDocumentBasicWithMapsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyBasicMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java index 4a0ee6d88d..68e6a364d8 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/creatableonly/EntityViewUpdateCreatableOnlyBasicTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.creatableonly.model.UpdatableDocumentBasicView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyBasicTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java index e51077edd9..ff2c10698f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicCollectionsTest.java @@ -5,8 +5,15 @@ package com.blazebit.persistence.view.testsuite.update.basic.mutable; +import java.util.Arrays; +import java.util.Collections; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -17,15 +24,10 @@ import com.blazebit.persistence.view.spi.type.MutableStateTrackable; import com.blazebit.persistence.view.testsuite.update.basic.AbstractEntityViewUpdateBasicCollectionsTest; import com.blazebit.persistence.view.testsuite.update.basic.mutable.model.UpdatableDocumentBasicWithCollectionsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.Collections; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -33,8 +35,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableBasicCollectionsTest extends AbstractEntityViewUpdateBasicCollectionsTest { public EntityViewUpdateMutableBasicCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java index 38facf6ca1..806ea34066 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicMapsTest.java @@ -5,8 +5,16 @@ package com.blazebit.persistence.view.testsuite.update.basic.mutable; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -17,16 +25,10 @@ import com.blazebit.persistence.view.spi.type.MutableStateTrackable; import com.blazebit.persistence.view.testsuite.update.basic.AbstractEntityViewUpdateBasicMapsTest; import com.blazebit.persistence.view.testsuite.update.basic.mutable.model.UpdatableDocumentBasicWithMapsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -34,8 +36,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableBasicMapsTest extends AbstractEntityViewUpdateBasicMapsTest { public EntityViewUpdateMutableBasicMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java index b11cfab17f..acc5bf924c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutable/EntityViewUpdateMutableBasicTest.java @@ -5,8 +5,15 @@ package com.blazebit.persistence.view.testsuite.update.basic.mutable; +import java.util.Arrays; +import java.util.Date; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -16,15 +23,11 @@ import com.blazebit.persistence.view.spi.type.MutableStateTrackable; import com.blazebit.persistence.view.testsuite.update.basic.AbstractEntityViewUpdateBasicTest; import com.blazebit.persistence.view.testsuite.update.basic.mutable.model.UpdatableDocumentBasicView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -32,8 +35,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableBasicTest extends AbstractEntityViewUpdateBasicTest { public EntityViewUpdateMutableBasicTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java index 961ff8d156..42fa80d74f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicCollectionsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.mutableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.mutableonly.model.UpdatableDocumentBasicWithCollectionsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyBasicCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java index 16c78f3d71..3a9293483d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicMapsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.mutableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.mutableonly.model.UpdatableDocumentBasicWithMapsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyBasicMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java index d158c54b26..5e390c443b 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/mutableonly/EntityViewUpdateMutableOnlyBasicTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.mutableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.mutableonly.model.UpdatableDocumentBasicView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyBasicTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java index 6006283e6b..c8cbbd22db 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicCollectionsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.updatableonly.model.UpdatableDocumentBasicWithCollectionsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyBasicCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java index 5fa508cb0c..a67d98e99f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicMapsTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.updatableonly.model.UpdatableDocumentBasicWithMapsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyBasicMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java index 23a4b16769..27d8ddddc3 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/basic/updatableonly/EntityViewUpdateUpdatableOnlyBasicTest.java @@ -5,14 +5,12 @@ package com.blazebit.persistence.view.testsuite.update.basic.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.basic.updatableonly.model.UpdatableDocumentBasicView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -22,8 +20,7 @@ * @author Christian Beikov * @since 1.12.0 */ -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyBasicTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java index 89c001e939..e3b7dcf3c6 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/converter/EntityViewUpdateBlobTest.java @@ -5,11 +5,22 @@ package com.blazebit.persistence.view.testsuite.update.converter; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.sql.Blob; +import java.sql.SQLException; +import java.time.Instant; +import java.util.Date; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.entity.BlobEntity; import com.blazebit.persistence.testsuite.tx.TxVoidWork; @@ -18,19 +29,7 @@ import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest; import com.blazebit.persistence.view.testsuite.update.converter.model.UpdatableBlobEntityView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import jakarta.persistence.EntityManager; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.sql.Blob; -import java.sql.SQLException; -import java.time.Instant; -import java.util.Date; import static org.junit.Assert.assertEquals; @@ -40,9 +39,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -// NOTE: Not sure why, but Hibernate 4.2 reports the LOB as being closed -@Category({ NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateBlobTest extends AbstractEntityViewUpdateTest { private BlobEntity entity; @@ -204,8 +201,7 @@ public void testSetBlob() throws Exception { @Test // Oracle keeps LOBs open/tied to a result set so we can't write to it by means of setBytes. // For Oracle it would be more appropriate to treat writes like "replacements" i.e. remember the written bytes and replace the underlying object on flush - // NOTE: No Datanucleus support yet - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOracle.class, NoH2.class}) + @Category({ NoEclipselink.class, NoOracle.class, NoH2.class}) public void testUpdateBlob() throws Exception { // Given { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java index d7a5531e1f..de5e12f2ab 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedCreatableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java index 9a3c83e0a6..22e891a13e 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/creatable/EntityViewUpdateCorrelatedCreatableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedCreatableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedCreatableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java index e275661b5f..93351ff56a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java index 31ee06522f..14252b9f0f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/immutable/EntityViewUpdateCorrelatedImmutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedImmutableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java index ee523cfdfb..856554b30a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedMutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedMutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java index 0a5ed97424..4df86cb192 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutable/EntityViewUpdateCorrelatedMutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedMutableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedMutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java index 7872a0e1f2..59e0bee13e 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedMutableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java index 1b0b9fb0c2..b1e94aa48e 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/mutableonly/EntityViewUpdateCorrelatedMutableOnlySubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedMutableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedMutableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java index 653ad928c0..d7b7bf7777 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedUpdatableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java index 461c54d770..5355cfef5d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/correlated/updatableonly/EntityViewUpdateCorrelatedUpdatableOnlySubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.correlated.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -31,7 +30,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCorrelatedUpdatableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateCorrelatedUpdatableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java index 0f017ec778..c6eabb7f45 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/elementcollection/ElementCollectionUpdateReferenceTest.java @@ -6,9 +6,7 @@ package com.blazebit.persistence.view.testsuite.update.elementcollection; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.spi.EntityViewConfiguration; @@ -19,7 +17,7 @@ import com.blazebit.persistence.view.testsuite.update.elementcollection.model.DocumentForElementCollectionsFlatViewElementsView; import com.blazebit.persistence.view.testsuite.update.elementcollection.model.DocumentForElementIdView; import com.blazebit.persistence.view.testsuite.update.elementcollection.model.PersonForElementCollectionsView; -import org.junit.Assume; + import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -39,7 +37,7 @@ */ @RunWith(Parameterized.class) // NOTE: No EclipseLink and Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class ElementCollectionUpdateReferenceTest extends AbstractEntityViewUpdateTest { private static final boolean REPLACE_WITH_REFERENCE_CONTENTS = true; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java index 0703dbd508..06770b2917 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableCollectionsTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; @@ -25,7 +24,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateNestedEmbeddableCollectionsTest extends AbstractEntityViewUpdateNestedEmbeddableEntityTest { public AbstractEntityViewUpdateNestedEmbeddableCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java index c58b585c43..fc26df4b09 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableMapsTest.java @@ -5,12 +5,9 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; -import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleEmbeddableEntityView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleIntIdEntityView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleNameObjectView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.UpdatableEmbeddableEntityWithMapsEmbeddableViewBase; @@ -28,7 +25,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateNestedEmbeddableMapsTest extends AbstractEntityViewUpdateNestedEmbeddableEntityTest { public AbstractEntityViewUpdateNestedEmbeddableMapsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java index b10be1b606..877f1f146d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/AbstractEntityViewUpdateNestedEmbeddableTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; @@ -24,7 +23,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateNestedEmbeddableTest extends AbstractEntityViewUpdateNestedEmbeddableEntityTest { public AbstractEntityViewUpdateNestedEmbeddableTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java index 8b0399a504..d14e948bfd 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/graph/EntityViewUpdateNestedEmbeddableCollectionsGraphTest.java @@ -5,22 +5,17 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested.graph; +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.AbstractEntityViewUpdateNestedEmbeddableEntityTest; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.graph.model.UpdatableEmbeddableEntityWithCollectionsView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.graph.model.UpdatableEmbeddableEntityWithMultipleCollectionsEmbeddableViewBase; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; /** @@ -29,8 +24,7 @@ * @since 1.3.0 */ // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedEmbeddableCollectionsGraphTest extends AbstractEntityViewUpdateNestedEmbeddableEntityTest { public EntityViewUpdateNestedEmbeddableCollectionsGraphTest() { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java index 998aedc0cd..abb7a2f64c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableCollectionsTest.java @@ -5,13 +5,19 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; @@ -21,18 +27,11 @@ import com.blazebit.persistence.view.testsuite.update.embeddable.nested.AbstractEntityViewUpdateNestedEmbeddableCollectionsTest; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleEmbeddableEntityView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable.model.UpdatableEmbeddableEntityWithCollectionsView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -41,8 +40,7 @@ */ @RunWith(Parameterized.class) // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateMutableNestedEmbeddableCollectionsTest extends AbstractEntityViewUpdateNestedEmbeddableCollectionsTest { public EntityViewUpdateMutableNestedEmbeddableCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java index 169428ae9e..99f0ce2ad4 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableMapsTest.java @@ -5,41 +5,30 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60; +import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; -import com.blazebit.persistence.view.change.ChangeModel; -import com.blazebit.persistence.view.change.MapChangeModel; -import com.blazebit.persistence.view.change.SingularChangeModel; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; -import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.AbstractEntityViewUpdateNestedEmbeddableMapsTest; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleIntIdEntityView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.model.SimpleNameObjectView; import com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable.model.UpdatableEmbeddableEntityWithMapsView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * @@ -48,10 +37,8 @@ */ @RunWith(Parameterized.class) // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections -// NOTE: No Datanucleus support yet -//@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class}) // NOTE: Hibernate 6 bug: https://hibernate.atlassian.net/browse/HHH-17383 -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class, NoHibernate60.class}) +@Category({ NoEclipselink.class, NoHibernate62.class}) public class EntityViewUpdateMutableNestedEmbeddableMapsTest extends AbstractEntityViewUpdateNestedEmbeddableMapsTest { public EntityViewUpdateMutableNestedEmbeddableMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java index d8fc531df9..4416406a19 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/nested/mutable/EntityViewUpdateMutableNestedEmbeddableTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.nested.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.view.FlushMode; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableNestedEmbeddableTest extends AbstractEntityViewUpdateNestedEmbeddableTest { public EntityViewUpdateMutableNestedEmbeddableTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java index 60e21a0313..8635c7f569 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableCollectionsTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; @@ -25,7 +24,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateEmbeddableCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public AbstractEntityViewUpdateEmbeddableCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java index ebe8ff9edd..daa2a36dcb 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableMapsTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; @@ -25,7 +24,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateEmbeddableMapsTest extends AbstractEntityViewUpdateDocumentTest { public AbstractEntityViewUpdateEmbeddableMapsTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java index 45464b2628..73d9627092 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/AbstractEntityViewUpdateEmbeddableTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; @@ -23,7 +22,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractEntityViewUpdateEmbeddableTest extends AbstractEntityViewUpdateDocumentTest { public AbstractEntityViewUpdateEmbeddableTest(FlushMode mode, FlushStrategy strategy, boolean version, Class viewType) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java index 38129a79ec..4646b7ce4d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableCollectionsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable.model.UpdatableDocumentEmbeddableWithCollectionsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableEmbeddableCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java index 6a9464e67a..50147fec8c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableMapsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable.model.UpdatableDocumentEmbeddableWithMapsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableEmbeddableMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java index 15ab66fa99..ca52e0ca88 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatable/EntityViewUpdateCreatableEmbeddableTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatable.model.UpdatableDocumentEmbeddableView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableEmbeddableTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java index 4b1111ce71..19c7b4719f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly.model.UpdatableDocumentEmbeddableWithCollectionsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyEmbeddableCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java index af3c34bfbd..d4ef971ff3 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableMapsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly.model.UpdatableDocumentEmbeddableWithMapsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyEmbeddableMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java index c03fab627c..da9a9b1d35 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/creatableonly/EntityViewUpdateCreatableOnlyEmbeddableTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.creatableonly.model.UpdatableDocumentEmbeddableView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyEmbeddableTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java index 3667285806..979ac7fbd4 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableCollectionsTest.java @@ -5,13 +5,15 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable; +import java.util.Arrays; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; @@ -19,18 +21,15 @@ import com.blazebit.persistence.view.change.ChangeModel; import com.blazebit.persistence.view.change.PluralChangeModel; import com.blazebit.persistence.view.change.SingularChangeModel; -import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType; import com.blazebit.persistence.view.spi.EntityViewConfiguration; +import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.AbstractEntityViewUpdateEmbeddableCollectionsTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable.model.UpdatableDocumentEmbeddableWithCollectionsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -39,8 +38,7 @@ */ @RunWith(Parameterized.class) // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateMutableEmbeddableCollectionsTest extends AbstractEntityViewUpdateEmbeddableCollectionsTest { private boolean registerType; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java index a3c9868df2..41c9723ecd 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableMapsTest.java @@ -5,13 +5,16 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable; +import java.util.Arrays; +import java.util.Map; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate51; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.FlushMode; @@ -19,20 +22,15 @@ import com.blazebit.persistence.view.change.ChangeModel; import com.blazebit.persistence.view.change.MapChangeModel; import com.blazebit.persistence.view.change.SingularChangeModel; -import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType; import com.blazebit.persistence.view.spi.EntityViewConfiguration; +import com.blazebit.persistence.view.spi.type.AbstractMutableBasicUserType; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.AbstractEntityViewUpdateEmbeddableMapsTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable.model.UpdatableDocumentEmbeddableWithMapsView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Arrays; -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @@ -41,8 +39,7 @@ */ @RunWith(Parameterized.class) // NOTE: Only the latest Hibernate 5.2 properly implements support for selecting element collections -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateMutableEmbeddableMapsTest extends AbstractEntityViewUpdateEmbeddableMapsTest { private boolean registerType; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java index 25bf6ae997..e102da42b9 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutable/EntityViewUpdateMutableEmbeddableTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableEmbeddableTest extends AbstractEntityViewUpdateEmbeddableTest { private final boolean registerType; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java index 1d03dc3344..313a6a77f1 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableCollectionsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly.model.UpdatableDocumentEmbeddableWithCollectionsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyEmbeddableCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java index a823444472..091f01f7b5 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableMapsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly.model.UpdatableDocumentEmbeddableWithMapsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyEmbeddableMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java index cd372c238f..0c4e91e0c7 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/mutableonly/EntityViewUpdateMutableOnlyEmbeddableTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.mutableonly.model.UpdatableDocumentEmbeddableView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyEmbeddableTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java index f9341e6557..10527c8b11 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/negative/EntityViewUpdateInverseMappingEmbeddableCollectionsTest.java @@ -5,16 +5,13 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.negative; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.view.EntityView; -import com.blazebit.persistence.view.EntityViews; import com.blazebit.persistence.view.IdMapping; import com.blazebit.persistence.view.UpdatableEntityView; import com.blazebit.persistence.view.MappingInverse; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -30,7 +27,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateInverseMappingEmbeddableCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java index 46e119bf6d..b9be78a793 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly.model.UpdatableDocumentEmbeddableWithCollectionsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyEmbeddableCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java index 566c95db5d..3a5f8e1813 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableMapsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly.model.UpdatableDocumentEmbeddableWithMapsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyEmbeddableMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java index 35a18a67d4..2113cb99db 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/embeddable/simple/updatableonly/EntityViewUpdateUpdatableOnlyEmbeddableTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.embeddable.simple.updatableonly.model.UpdatableDocumentEmbeddableView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyEmbeddableTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java index 80837ac2a7..7f1b1afbbe 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -31,7 +30,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest { public EntityViewUpdateCreatableEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java index e2b8cb6122..2b2fa96750 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest { public EntityViewUpdateCreatableEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java index 901af56bcd..91164e35fb 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatable/EntityViewUpdateCreatableEntityTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableEntityTest extends AbstractEntityViewUpdateEntityTest { public EntityViewUpdateCreatableEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java index 9cb0d5e29a..b87b5e2450 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityCollectionsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.entity.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.entity.creatableonly.model.UpdatableDocumentEntityWithCollectionsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyEntityCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java index 9da8f0f9f6..8fa86efe0a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityMapsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.entity.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.entity.creatableonly.model.UpdatableDocumentEntityWithMapsView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyEntityMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java index 12524dd661..a873c3f902 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/creatableonly/EntityViewUpdateCreatableOnlyEntityTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.entity.creatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.entity.creatableonly.model.UpdatableDocumentEntityView; import org.junit.Test; @@ -23,7 +20,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateCreatableOnlyEntityTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java index 4dec1af300..c9e471d684 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -31,7 +30,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest { public EntityViewUpdateMutableEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java index 30901e5b24..5b72ebaeef 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest { public EntityViewUpdateMutableEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java index a47617a4f3..7876495fab 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutable/EntityViewUpdateMutableEntityTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableEntityTest extends AbstractEntityViewUpdateEntityTest { public EntityViewUpdateMutableEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java index a3caacd848..e2f303f581 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest { public EntityViewUpdateMutableOnlyEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java index 777998ce80..7cb520ea9d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest { public EntityViewUpdateMutableOnlyEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java index 5985ad8bfc..031377cfeb 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/mutableonly/EntityViewUpdateMutableOnlyEntityTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateMutableOnlyEntityTest extends AbstractEntityViewUpdateEntityTest { public EntityViewUpdateMutableOnlyEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java index 2f229b1099..463ff887f4 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyEntityCollectionsTest extends AbstractEntityViewUpdateEntityCollectionsTest { public EntityViewUpdateUpdatableOnlyEntityCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java index a2e10a4988..709077be8a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyEntityMapsTest extends AbstractEntityViewUpdateEntityMapsTest { public EntityViewUpdateUpdatableOnlyEntityMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java index b848a7dbec..5081c66eb9 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/entity/updatableonly/EntityViewUpdateUpdatableOnlyEntityTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.entity.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateUpdatableOnlyEntityTest extends AbstractEntityViewUpdateEntityTest { public EntityViewUpdateUpdatableOnlyEntityTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java index 161cfdd5c7..4d4ac4b931 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewCollectionsTest.java @@ -5,11 +5,16 @@ package com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable; +import java.util.Collection; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObjectContainer; import com.blazebit.persistence.view.FlushMode; @@ -19,15 +24,10 @@ import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableDocumentWithCollectionsView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectContainerView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Collection; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @@ -35,9 +35,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -// NOTE: Hibernate 4 does not support a list of embeddables containing embeddables -@Category({NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedMutableFlatViewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableFlatViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java index 507d79f5b0..e4c1795d0b 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewMapsTest.java @@ -5,11 +5,16 @@ package com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObjectContainer; import com.blazebit.persistence.view.FlushMode; @@ -19,15 +24,10 @@ import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableDocumentWithMapsView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectContainerView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable.model.UpdatableNameObjectView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @@ -35,9 +35,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -// NOTE: Hibernate 4 does not support a list of embeddables containing embeddables -@Category({NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedMutableFlatViewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableFlatViewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java index b18769312e..26bdfa50ac 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/mutable/EntityViewUpdateNestedMutableFlatViewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.nested.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedMutableFlatViewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableFlatViewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java index fcec331eb8..25975ac495 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest.java @@ -5,18 +5,14 @@ package com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableDocumentWithCollectionsView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectContainerView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -26,9 +22,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: Apparently Hibernate 4 does not support a list of embeddables containing embeddables -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedUpdatableOnlyFlatViewCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java index c61f654dcc..cf0dc52063 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest.java @@ -5,18 +5,14 @@ package com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableDocumentWithMapsView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectContainerView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -26,9 +22,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: Apparently Hibernate 4 does not support a list of embeddables containing embeddables -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedUpdatableOnlyFlatViewMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java index 55d6cc0cce..8b8e2a2919 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlyFlatViewTest.java @@ -5,18 +5,14 @@ package com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableDocumentView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectContainerView; import com.blazebit.persistence.view.testsuite.update.flatview.nested.updatableonly.model.UpdatableNameObjectView; -import org.junit.Test; -import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -26,9 +22,7 @@ * @author Christian Beikov * @since 1.2.0 */ -// NOTE: Apparently Hibernate 4 does not support a list of embeddables containing embeddables -// NOTE: No Datanucleus support yet -@Category({ NoHibernate42.class, NoHibernate43.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedUpdatableOnlyFlatViewTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java index 9cad3ad746..bab52ec003 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IntIdEntity; @@ -38,7 +37,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableFlatViewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableFlatViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java index 8eefc8054e..b23e8a31c8 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableFlatViewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableFlatViewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java index dc9d74389b..dde62603cd 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutable/EntityViewUpdateSimpleMutableFlatViewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IntIdEntity; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableFlatViewTest extends AbstractEntityViewUpdateDocumentTest { private Integer i1Id; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java index 3d3b70007c..6085299233 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutablesubtype; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableSubtypeFlatViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java index d2028808c0..ad6310bb08 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutablesubtype; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableSubtypeFlatViewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java index 334f7ee038..5f66a1b1f7 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/mutablesubtype/EntityViewUpdateSimpleMutableSubtypeFlatViewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.mutablesubtype; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableSubtypeFlatViewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableSubtypeFlatViewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java index 6c9f45e731..0caeb37e21 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableDocumentWithCollectionsView; import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableNameObjectView; @@ -24,7 +21,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleUpdatableOnlyFlatViewCollectionsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java index 8b47202e64..013f5dde2a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableDocumentWithMapsView; import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableNameObjectView; @@ -24,7 +21,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleUpdatableOnlyFlatViewMapsTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java index 573c58bd68..b1e4fc110d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/flatview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlyFlatViewTest.java @@ -5,10 +5,7 @@ package com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.view.EntityViews; -import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableDocumentView; import com.blazebit.persistence.view.testsuite.update.flatview.simple.updatableonly.model.UpdatableNameObjectView; @@ -24,7 +21,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleUpdatableOnlyFlatViewTest extends AbstractEntityViewTest { @Test diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java index fafe4e9f62..5a991b0045 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.listener; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.view.FlushMode; @@ -37,7 +36,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateListenerCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateListenerCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java index 29d516d77b..3e78daa189 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.listener; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.view.FlushMode; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateListenerMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateListenerMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java index 3671ffda18..498fe0a30f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/listener/EntityViewUpdateListenerTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.listener; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.view.EntityViewManager; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateListenerTest extends AbstractEntityViewUpdateDocumentTest { private static Date POST_UPDATE_DATE = new Date(0); diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java index ff26ddb891..8a3428b831 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelFlatViewTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.metamodel; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.NameObject; @@ -32,7 +31,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewMetamodelFlatViewTest extends AbstractEntityViewTest { private final EntityViewConfiguration entityViewConfiguration; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java index 19e8e531d4..cb2fcc79d5 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/metamodel/EntityViewMetamodelTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.metamodel; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -42,7 +41,7 @@ * @since 1.2.0 */ // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewMetamodelTest extends AbstractEntityViewTest { private final EntityViewConfiguration entityViewConfiguration; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java index fa145b34a7..7cd01333bf 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/AbstractBookEntityViewTest.java @@ -5,7 +5,6 @@ package com.blazebit.persistence.view.testsuite.update.natural; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public abstract class AbstractBookEntityViewTest extends AbstractEntityViewUpdateTest { protected NaturalIdJoinTableEntity e1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java index a687ababcf..bac096cdae 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.natural; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.NaturalIdJoinTableEntity; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewCollectionsTest extends AbstractBookEntityViewTest { public EntityViewUpdateSimpleImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java index 52af717e0f..ff8fc2b39c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest.java @@ -8,7 +8,6 @@ import com.blazebit.persistence.ConfigurationProperties; import com.blazebit.persistence.spi.CriteriaBuilderConfiguration; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.NaturalIdJoinTableEntity; @@ -38,7 +37,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest extends AbstractBookEntityViewTest { public EntityViewUpdateSimpleImmutableSubviewIdViewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java index a0919ce51a..3df286a7b6 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.natural; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.NaturalIdJoinTableEntity; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewMapsTest extends AbstractBookEntityViewTest { public EntityViewUpdateSimpleImmutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java index dab6ef3f0a..65303ec7e0 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.natural; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewTest extends AbstractBookEntityViewTest { public EntityViewUpdateSimpleImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java index 940c2c451b..ae1e625dbe 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/natural/EntityViewUpdateSimpleImmutableSubviewWithPkIdTest.java @@ -6,19 +6,16 @@ package com.blazebit.persistence.view.testsuite.update.natural; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.BookISBNReferenceEntity; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.spi.EntityViewConfiguration; -import com.blazebit.persistence.view.testsuite.update.natural.model.BookIdView; -import com.blazebit.persistence.view.testsuite.update.natural.model.BookIsbnView; import com.blazebit.persistence.view.testsuite.update.natural.model.BookIsbnWithPkView; import com.blazebit.persistence.view.testsuite.update.natural.model.BookPkWithIsbnView; import com.blazebit.persistence.view.testsuite.update.natural.model.UpdatableBookReferencePkView; -import com.blazebit.persistence.view.testsuite.update.natural.model.UpdatableBookReferenceView; + import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -33,7 +30,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewWithPkIdTest extends AbstractBookEntityViewTest { public EntityViewUpdateSimpleImmutableSubviewWithPkIdTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java index 4dcebbd414..30b3962967 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewCollectionsTest.java @@ -7,7 +7,6 @@ import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertSelectStatementBuilder; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewRemoveNestedSubviewCollectionsTest extends AbstractEntityViewRemoveDocumentTest { public EntityViewRemoveNestedSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java index 60ba7af0d0..92c8faf202 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewMapsTest.java @@ -7,7 +7,6 @@ import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertSelectStatementBuilder; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewRemoveNestedSubviewMapsTest extends AbstractEntityViewRemoveDocumentTest { public EntityViewRemoveNestedSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java index 42d83ea9c2..6009fec628 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/nested/EntityViewRemoveNestedSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.remove.cascade.nested; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewRemoveNestedSubviewTest extends AbstractEntityViewRemoveDocumentTest { public EntityViewRemoveNestedSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java index fa2c46e523..023d7bbae6 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/cascade/simple/EntityViewRemoveCascadeOneToManyTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.remove.cascade.simple; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.PrimitiveDocument; import com.blazebit.persistence.testsuite.entity.PrimitiveFamily; @@ -39,7 +38,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewRemoveCascadeOneToManyTest extends AbstractEntityViewUpdateTest { private PrimitiveFamily family; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java index 0cfb7d3695..3429e16144 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.remove.orphan.nested; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewOrphanRemoveNestedSubviewCollectionsTest extends AbstractEntityViewOrphanRemoveDocumentTest { public EntityViewOrphanRemoveNestedSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java index a8c8342684..8674b36d3d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.remove.orphan.nested; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewOrphanRemoveNestedSubviewMapsTest extends AbstractEntityViewOrphanRemoveDocumentTest { public EntityViewOrphanRemoveNestedSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java index 21cd4a4d00..fe3f7c974a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/remove/orphan/nested/EntityViewOrphanRemoveNestedSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.remove.orphan.nested; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewOrphanRemoveNestedSubviewTest extends AbstractEntityViewOrphanRemoveDocumentTest { public EntityViewOrphanRemoveNestedSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java index 929438b39b..9734edddc0 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.rollback; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -29,7 +28,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateRollbackCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateRollbackCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java index 0006f0f575..6a74b0db11 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/rollback/EntityViewUpdateRollbackTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.rollback; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.tx.TxVoidWork; @@ -39,7 +38,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateRollbackTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateRollbackTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java index d37f0a7294..98acad93e1 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/singular/SingularListUpdateTest.java @@ -5,25 +5,24 @@ package com.blazebit.persistence.view.testsuite.update.singular; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; import com.blazebit.persistence.testsuite.entity.SingularListEntity; import com.blazebit.persistence.view.FlushMode; import com.blazebit.persistence.view.FlushStrategy; import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest; import com.blazebit.persistence.view.testsuite.update.singular.model.SingularListEntityView; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import jakarta.persistence.EntityManager; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -33,9 +32,7 @@ * @since 1.6.8 */ @RunWith(Parameterized.class) -// NOTE: Hibernate 4.2 doesn't support attribute converters -// NOTE: No EclipseLink and Datanucleus support yet -@Category({ NoHibernate42.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class SingularListUpdateTest extends AbstractEntityViewUpdateTest { private SingularListEntity entity1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java index c4c203b680..a9b7dfa53d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/graph/EntityViewUpdateSubviewGraphTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.graph; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -40,7 +39,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewGraphTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSubviewGraphTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java index 7ff47f9385..d45a005077 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/complex/EntityViewUpdateSubviewInverseEmbeddedComplexTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.embedded.complex; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -51,7 +50,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseEmbeddedComplexTest extends AbstractEntityViewUpdateTest { @Override diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java index f5c737a0f9..3a3c185a36 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/entityid/EntityViewUpdateSubviewInverseEmbeddedEntityIdTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.embedded.entityid; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -46,7 +45,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseEmbeddedEntityIdTest extends AbstractEntityViewUpdateTest { @Override diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java index 5bd2fc04da..50d5e7ac71 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/embedded/simple/EntityViewUpdateSubviewInverseEmbeddedSimpleTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.embedded.simple; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -55,7 +54,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseEmbeddedSimpleTest extends AbstractEntityViewUpdateTest { @Override diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java index 3223a551a3..7f72397d45 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/entity/EntityViewUpdateSubviewInverseOneToOneEntityTest.java @@ -5,10 +5,14 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.entity; +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentForSimpleOneToOne; import com.blazebit.persistence.testsuite.entity.DocumentInfoSimple; @@ -19,12 +23,6 @@ import com.blazebit.persistence.view.testsuite.update.AbstractEntityViewUpdateTest; import com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.entity.model.DocumentForOneToOneIdView; import com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.entity.model.UpdatableDocumentForOneToOneView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - import jakarta.persistence.EntityManager; /** @@ -33,10 +31,8 @@ * @since 1.3.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -//@Category({ NoDatanucleus.class, NoEclipselink.class}) // NOTE: Hibernate has a bug when selecting inverse one-to-ones: https://hibernate.atlassian.net/browse/HHH-12885 -@Category({ NoHibernate.class, NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseOneToOneEntityTest extends AbstractEntityViewUpdateTest { private DocumentForSimpleOneToOne doc1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java index 73c9d123ab..f56990aa7c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/onetoone/simple/EntityViewUpdateSubviewInverseOneToOneSimpleTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.onetoone.simple; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.DocumentForSimpleOneToOne; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseOneToOneSimpleTest extends AbstractEntityViewUpdateTest { private DocumentForSimpleOneToOne doc1; diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java index c0c909b0c2..e0bc50028a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/simple/EntityViewUpdateSubviewInverseSimpleTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.simple; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseSimpleTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSubviewInverseSimpleTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java index dbe72ac0bc..efbbfb2172 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/subtype/EntityViewUpdateSubviewInverseSubtypeTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.subtype; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseSubtypeTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSubviewInverseSubtypeTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java index 164bc74433..ff00336fe8 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/inverse/unmapped/EntityViewUpdateSubviewInverseUmappedTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.inverse.unmapped; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewInverseUmappedTest extends AbstractEntityViewUpdateTest { public EntityViewUpdateSubviewInverseUmappedTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java index 8c67c37171..99129a1a03 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/inverse/EntityViewUpdateSubviewMultiParentInverseTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.multiparent.inverse; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewMultiParentInverseTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSubviewMultiParentInverseTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java index 45855f691b..e7b4ad5ce1 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/jointable/EntityViewUpdateSubviewMultiParentJoinTableTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.multiparent.jointable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewMultiParentJoinTableTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSubviewMultiParentJoinTableTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java index 07978f2214..bd89212a79 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/multiparent/selfreferential/EntityViewUpdateSubviewMultiParentSelfReferentialTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.multiparent.selfreferential; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.view.FlushMode; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSubviewMultiParentSelfReferentialTest extends AbstractEntityViewUpdateTest { public EntityViewUpdateSubviewMultiParentSelfReferentialTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java index c1d870e986..9c659ed020 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedCreatableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedCreatableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java index aca818c57e..c1ee301276 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedCreatableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedCreatableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java index 6f9be7aac6..c4b2a46fe3 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/creatable/EntityViewUpdateNestedCreatableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedCreatableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedCreatableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java index 132a37782f..3d1aeaa6fa 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedImmutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java index e49d9c7902..9168fd4dad 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedImmutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedImmutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java index 06a229ba9f..880c6e5293 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/immutable/EntityViewUpdateNestedImmutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedImmutableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java index de15f52193..3e12f5d8e0 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedMutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java index 28e3961d30..6a21927281 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewMapsTest.java @@ -5,8 +5,16 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.mutable; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -17,16 +25,10 @@ import com.blazebit.persistence.view.testsuite.update.subview.nested.mutable.model.UpdatableDocumentWithMapsView; import com.blazebit.persistence.view.testsuite.update.subview.nested.mutable.model.UpdatableFriendPersonView; import com.blazebit.persistence.view.testsuite.update.subview.nested.mutable.model.UpdatableResponsiblePersonView; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import java.util.HashMap; -import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @@ -34,8 +36,7 @@ * @since 1.2.0 */ @RunWith(Parameterized.class) -// NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class }) +@Category({ NoEclipselink.class }) public class EntityViewUpdateNestedMutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java index 668612e9a1..958425345e 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutable/EntityViewUpdateNestedMutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedMutableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java index 61aaf40d22..336fbcc3e8 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedMutableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java index 015a7e1f63..7ab225bd6d 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedMutableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java index 87048382dc..24541f6bff 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/mutableonly/EntityViewUpdateNestedMutableOnlySubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedMutableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedMutableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java index 0d3b942322..5079462c60 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedUpdatableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java index 48fa5cef5c..50c5e31fa6 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -36,7 +35,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedUpdatableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedUpdatableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java index 2a95dce54d..ac4b337593 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/nested/updatableonly/EntityViewUpdateNestedUpdatableOnlySubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.nested.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateNestedUpdatableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateNestedUpdatableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java index 0699f73582..25257dd32f 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleCreatableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleCreatableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java index 0c7969824e..50ae34ec03 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleCreatableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleCreatableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java index b1ee92010e..1dd1f1885a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/creatable/EntityViewUpdateSimpleCreatableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.creatable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -33,7 +32,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleCreatableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleCreatableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java index 7e48686f4a..63ca2569c4 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleImmutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java index d0ce3586b8..a854150100 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleImmutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java index e8908b0dbe..bc89b563f6 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/immutable/EntityViewUpdateSimpleImmutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.immutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.FlushMode; @@ -30,7 +29,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleImmutableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleImmutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java index 840ca2c112..51b4a7994a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -37,7 +36,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableSubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableSubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java index 294e40edc9..796ac9215a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableSubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableSubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java index 8dae4d5f81..98b369b30a 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutable/EntityViewUpdateSimpleMutableSubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.mutable; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableSubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableSubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java index e2d03b655a..45b979fa8c 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java index 04b0b9279f..fe3fc20646 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java index 618d31fc10..c0755c1670 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/mutableonly/EntityViewUpdateSimpleMutableOnlySubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.mutableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleMutableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleMutableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java index fe8ab6ba50..42e3600b75 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -35,7 +34,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleUpdatableOnlySubviewCollectionsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java index 9d545e80d1..b5ba311986 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; @@ -34,7 +33,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleUpdatableOnlySubviewMapsTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java index 53f21ccbd5..dde37c7522 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/update/subview/simple/updatableonly/EntityViewUpdateSimpleUpdatableOnlySubviewTest.java @@ -6,7 +6,6 @@ package com.blazebit.persistence.view.testsuite.update.subview.simple.updatableonly; import com.blazebit.persistence.testsuite.base.jpa.assertion.AssertStatementBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.view.ConfigurationProperties; @@ -32,7 +31,7 @@ */ @RunWith(Parameterized.class) // NOTE: No Datanucleus support yet -@Category({ NoDatanucleus.class, NoEclipselink.class}) +@Category({ NoEclipselink.class}) public class EntityViewUpdateSimpleUpdatableOnlySubviewTest extends AbstractEntityViewUpdateDocumentTest { public EntityViewUpdateSimpleUpdatableOnlySubviewTest(FlushMode mode, FlushStrategy strategy, boolean version) { diff --git a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java index 5e3611e87e..00f8203acd 100644 --- a/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java +++ b/entity-view/testsuite/src/test/java/com/blazebit/persistence/view/testsuite/viewroot/SecondaryViewRootTest.java @@ -5,14 +5,14 @@ package com.blazebit.persistence.view.testsuite.viewroot; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate43; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate50; -import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.tx.TxVoidWork; @@ -22,12 +22,7 @@ import com.blazebit.persistence.view.spi.EntityViewConfiguration; import com.blazebit.persistence.view.testsuite.AbstractEntityViewTest; import com.blazebit.persistence.view.testsuite.viewroot.model.DocumentWithViewRoots; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.EntityManager; -import java.util.List; import static org.junit.Assert.assertEquals; @@ -36,11 +31,8 @@ * @author Christian Beikov * @since 1.6.0 */ -// NOTE: Requires entity joins which are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink // NOTE: Eclipselink doesn't like the limit subquery function -// NOTE: Datanucleus can't handle "alias IN (subquery)" -// NOTE: Requires lateral joins or support for correlated limit subquery in ON clause which older MySQL versions don't support -@Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoOpenJPA.class, NoEclipselink.class, NoMySQLOld.class }) +@Category({ NoEclipselink.class }) public class SecondaryViewRootTest extends AbstractEntityViewTest { private Document doc1; diff --git a/integration/deltaspike-data/testsuite/pom.xml b/integration/deltaspike-data/testsuite/pom.xml index 72a96a2676..9f0dc7a239 100644 --- a/integration/deltaspike-data/testsuite/pom.xml +++ b/integration/deltaspike-data/testsuite/pom.xml @@ -153,7 +153,7 @@ maven-surefire-plugin ${surefire.jvm.params} - com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,com.blazebit.persistence.testsuite.base.jpa.category.NoMySQLOld,${jpa.excludedGroups} + com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL,${jpa.excludedGroups} jdbc:mysql://${dbHost}:3306/test?useUnicode=true&characterEncoding=utf8&databaseTerm=schema&nullDatabaseMeansCurrent=true root @@ -385,7 +385,7 @@ hibernate-6.2 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 @@ -447,6 +447,10 @@ org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + -AaddGeneratedAnnotation=false + @@ -455,7 +459,7 @@ hibernate-6.4 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64 @@ -525,7 +529,7 @@ hibernate-6.6 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 true @@ -671,7 +675,7 @@ hibernate-apt - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 diff --git a/integration/jaxrs-jsonb/pom.xml b/integration/jaxrs-jsonb/pom.xml index 0f22a33669..ded9ca85ac 100644 --- a/integration/jaxrs-jsonb/pom.xml +++ b/integration/jaxrs-jsonb/pom.xml @@ -88,11 +88,6 @@ ${project.groupId} blaze-common-utils - - jakarta.ws.rs - jakarta.ws.rs-api - provided - org.glassfish.jersey.core jersey-common diff --git a/integration/jsonb/pom.xml b/integration/jsonb/pom.xml index ae55cac233..1cbaf9c0cf 100644 --- a/integration/jsonb/pom.xml +++ b/integration/jsonb/pom.xml @@ -66,11 +66,6 @@ ${project.groupId} blaze-common-utils - - jakarta.persistence - jakarta.persistence-api - provided - ${project.groupId} blaze-persistence-core-impl diff --git a/integration/quarkus-3/deployment/pom.xml b/integration/quarkus-3/deployment/pom.xml index e30b7f249a..e9ba0fde5a 100644 --- a/integration/quarkus-3/deployment/pom.xml +++ b/integration/quarkus-3/deployment/pom.xml @@ -103,6 +103,40 @@ ${project.version} + + + org.junit.jupiter + junit-jupiter + ${version.junit-jupiter} + + + org.junit.jupiter + junit-jupiter-api + ${version.junit-jupiter} + + + org.junit.platform + junit-platform-commons + ${version.junit-platform} + + + org.junit.platform + junit-platform-engine + ${version.junit-platform} + + + org.junit.jupiter + junit-jupiter-params + ${version.junit-jupiter} + test + + + org.junit.jupiter + junit-jupiter-engine + ${version.junit-jupiter} + test + + io.rest-assured diff --git a/integration/querydsl/testsuite/pom.xml b/integration/querydsl/testsuite/pom.xml index 15340a6423..6cb3bb2085 100644 --- a/integration/querydsl/testsuite/pom.xml +++ b/integration/querydsl/testsuite/pom.xml @@ -293,7 +293,7 @@ hibernate-6.2 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 @@ -356,6 +356,10 @@ org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + -AaddGeneratedAnnotation=false + @@ -364,7 +368,7 @@ hibernate-6.4 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate64 @@ -435,7 +439,7 @@ hibernate-6.6 - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate66 true diff --git a/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java b/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java index a5f1765d68..76f69f5ea1 100644 --- a/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java +++ b/integration/querydsl/testsuite/src/test/java/com/blazebit/persistence/querydsl/BasicQueryTest.java @@ -5,6 +5,20 @@ package com.blazebit.persistence.querydsl; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.stream.Stream; + +import org.junit.Assume; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.rules.ExpectedException; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.FinalSetOperationCriteriaBuilder; import com.blazebit.persistence.JoinType; @@ -12,7 +26,9 @@ import com.blazebit.persistence.Queryable; import com.blazebit.persistence.spi.LateralStyle; import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.*; +import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; +import com.blazebit.persistence.testsuite.base.jpa.category.NoH2; +import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; import com.blazebit.persistence.testsuite.entity.BookEntity; import com.blazebit.persistence.testsuite.entity.Document; import com.blazebit.persistence.testsuite.entity.IdHolderCTE; @@ -40,22 +56,17 @@ import com.querydsl.jpa.JPQLQuery; import com.querydsl.jpa.JPQLTemplates; import com.querydsl.jpa.impl.JPAQuery; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.rules.ExpectedException; - import jakarta.persistence.EntityManager; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.stream.Stream; -import static com.blazebit.persistence.querydsl.JPQLNextExpressions.*; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.bind; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.castToNum; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.lastValue; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.literal; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.rowNumber; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.select; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.selectFrom; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.selectOne; +import static com.blazebit.persistence.querydsl.JPQLNextExpressions.sum; import static com.blazebit.persistence.querydsl.SetUtils.intersect; import static com.blazebit.persistence.querydsl.SetUtils.union; import static com.blazebit.persistence.querydsl.SetUtils.unionAll; @@ -63,7 +74,6 @@ import static com.blazebit.persistence.testsuite.entity.QIdHolderCTE.idHolderCTE; import static com.blazebit.persistence.testsuite.entity.QPerson.person; import static com.blazebit.persistence.testsuite.entity.QRecursiveEntity.recursiveEntity; -import static com.querydsl.core.types.dsl.Expressions.asNumber; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -203,7 +213,7 @@ public void testExplicitJoinFollowedByImplicitJoin3() { // NOTE: This requires advanced SQL support @Test - @Category({ NoEclipselink.class, NoDatanucleus.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testFetchCount() { doInJPA(em -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -285,7 +295,7 @@ public void testThroughBlazeJPAQuery() { @Test // NOTE: Querydsl integration needs JPA 2.2 for streaming to work - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class}) + @Category({ NoEclipselink.class }) public void testResultStream() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -318,9 +328,7 @@ public void testParameterExpression() { }); } - // Note: Datanucleus has issues with parameters in the select clause @Test - @Category({NoDatanucleus.class}) public void testParameterExpressionInSelect() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -352,9 +360,7 @@ public void testSubQuery() { }); } - // NOTE: Window functions were only introduced in MySQL8 @Test - @Category({ NoMySQLOld.class }) public void testWindowFunction() { Assume.assumeTrue(dbmsDialect.supportsWindowFunctions()); @@ -372,9 +378,7 @@ public void testWindowFunction() { }); } - // NOTE: Window functions were only introduced in MySQL8 @Test - @Category({ NoMySQLOld.class }) public void testNamedWindowFunction() { Assume.assumeTrue(dbmsDialect.supportsWindowFunctions()); @@ -398,7 +402,6 @@ public void testNamedWindowFunction() { @Test @Ignore("Filter support is work in progress") - @Category({ NoMySQLOld.class }) public void testFilteredWindowfunction() { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -422,7 +425,7 @@ public void testFilteredWindowfunction() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testNestedSubQuery() { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -467,9 +470,8 @@ public void testAssociationJoin() { }); } - // NOTE: Entity joins are only supported on Hibernate 5.1+ @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class }) + @Category({ NoEclipselink.class }) public void testEntityJoin() { Assume.assumeTrue(jpaProvider.supportsEntityJoin()); @@ -489,7 +491,7 @@ public void testEntityJoin() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testFromValues() { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -509,7 +511,7 @@ public void testFromValues() { // NOTE: Querydsl integration needs JPA 2.2 for streaming to work @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class}) + @Category({ NoEclipselink.class }) public void testFromValuesStream() { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -532,7 +534,7 @@ public void testFromValuesStream() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testFromValuesAttributes() { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -550,7 +552,7 @@ public void testFromValuesAttributes() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testComplexUnion() { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -588,7 +590,7 @@ public void testComplexUnion() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet // NOTE: MySQL only supports the UNION set operation @Test - @Category({ NoMySQL.class, NoFirebird.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoMySQL.class, NoEclipselink.class }) public void testComplexSubqueryUnion() { doInJPA(entityManager -> { Person person = new Person(); @@ -632,7 +634,7 @@ public void testComplexSubqueryUnion() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testCTE() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -648,7 +650,7 @@ public void testCTE() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testCTEClone() { doInJPA(entityManager -> { BlazeJPAQuery from = new BlazeJPAQuery(entityManager, cbf) @@ -664,7 +666,7 @@ public void testCTEClone() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet // NOTE: Querydsl integration needs JPA 2.2 for streaming to work @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoHibernate52.class}) + @Category({ NoEclipselink.class }) public void testCTEStream() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -681,7 +683,7 @@ public void testCTEStream() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testCTEWithBinds() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -697,7 +699,7 @@ public void testCTEWithBinds() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testCTEWithBindsWithAlias() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -713,7 +715,7 @@ public void testCTEWithBindsWithAlias() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testCTEWithBinds2() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -731,7 +733,7 @@ public void testCTEWithBinds2() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet // NOTE: MySQL only supports the UNION set operation @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQL.class }) + @Category({ NoEclipselink.class, NoMySQL.class }) public void testCTEUnion() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -747,7 +749,7 @@ public void testCTEUnion() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testCTEFromValues() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -768,9 +770,8 @@ public void testCTEFromValues() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Recursive CTE support was only added in MySQL8 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testRecursiveCTEUnion() { Assume.assumeTrue(dbmsDialect.supportsWithClause()); JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -788,9 +789,8 @@ public void testRecursiveCTEUnion() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Recursive CTE support was only added in MySQL8 @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testRecursiveBindBuilder() { Assume.assumeTrue(dbmsDialect.supportsWithClause()); @@ -811,7 +811,7 @@ public void testRecursiveBindBuilder() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testInlineEntityWithLimit() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -833,7 +833,7 @@ public void testInlineEntityWithLimit() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) + @Category({ NoEclipselink.class }) public void testCteInSubquery() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -852,10 +852,8 @@ public void testCteInSubquery() { }); } - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // NOTE: Hibernate 5.1 renders t.id = tSub.id rather than t = tSub @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class}) + @Category({ NoEclipselink.class }) public void testMultipleInlineEntityWithLimitJoin() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -885,10 +883,9 @@ public void testMultipleInlineEntityWithLimitJoin() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // Oracle, H2 and MySQL <8 do not support lateral joins + // H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOracle.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoH2.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testMultipleInlineEntityWithLimitJoinLateral() { Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE); @@ -920,10 +917,9 @@ public void testMultipleInlineEntityWithLimitJoinLateral() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // Oracle, H2 and MySQL <8 do not support lateral joins + // H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoH2.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinInlineEntityWithLimit() { Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE); @@ -946,10 +942,9 @@ public void testJoinInlineEntityWithLimit() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // Oracle, H2 and MySQL <8 do not support lateral joins + // H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoH2.class, NoMySQLOld.class, NoOracle.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinInlineEntityWithLimitWithCTE() { Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE); @@ -975,9 +970,8 @@ public void testJoinInlineEntityWithLimitWithCTE() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Entity joins are only supported on Hibernate 5.1+ @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoMySQL.class }) + @Category({ NoEclipselink.class }) public void testJoinInlineWithLimitUnion() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -1014,10 +1008,8 @@ public void testJoinInlineWithLimitUnion() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // NOTE: MySQL (also MySQL 8) doesn't yet support 'nesting of unions at the right-hand side' @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoMySQL.class }) + @Category({ NoEclipselink.class }) public void testJoinInlineEntityWithLimitUnion() { doInJPA(entityManager -> { JPQLNextQueryFactory queryFactory = new BlazeJPAQueryFactory(em, cbf); @@ -1044,10 +1036,9 @@ public void testJoinInlineEntityWithLimitUnion() { } // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet - // NOTE: Entity joins are only supported on Hibernate 5.1+ - // Oracle, H2 and MySQL <8 do not support lateral joins + // H2 does not support lateral joins @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoHibernate51.class, NoH2.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class, NoH2.class }) public void testJoinInlineLateralEntityWithLimitUnion() { Assume.assumeFalse(dbmsDialect.getLateralStyle() == LateralStyle.NONE); @@ -1081,7 +1072,7 @@ public void testJoinInlineLateralEntityWithLimitUnion() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testMultipleFromEntitySubqueries() { doInJPA(em -> { String expected = cbf.create(em, Person.class) @@ -1113,7 +1104,7 @@ public void testMultipleFromEntitySubqueries() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testCteInLeftNestedSet() { doInJPA(em -> { FinalSetOperationCriteriaBuilder cb = cbf.startSet(em, Tuple.class) @@ -1159,7 +1150,7 @@ public void testCteInLeftNestedSet() { // NOTE: No advanced sql support for Datanucleus, Eclipselink and OpenJPA yet @Test - @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class, NoMySQLOld.class }) + @Category({ NoEclipselink.class }) public void testExpressionEqualToSubquery() { doInJPA(em -> { CriteriaBuilder select = cbf.create(em, Person.class) diff --git a/integration/spring-data/testsuite/webflux/pom.xml b/integration/spring-data/testsuite/webflux/pom.xml index b77b676b69..9f2727122b 100644 --- a/integration/spring-data/testsuite/webflux/pom.xml +++ b/integration/spring-data/testsuite/webflux/pom.xml @@ -21,7 +21,7 @@ ${version.spring-data-3.3} ${version.hibernate-6.2} - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 diff --git a/integration/spring-data/testsuite/webmvc/pom.xml b/integration/spring-data/testsuite/webmvc/pom.xml index 6845761d88..65ae7f308f 100644 --- a/integration/spring-data/testsuite/webmvc/pom.xml +++ b/integration/spring-data/testsuite/webmvc/pom.xml @@ -20,7 +20,7 @@ ${version.spring-data-3.3-spring-boot} ${version.spring-data-3.3} ${version.hibernate-6.2} - com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate60 + com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate,com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate62 diff --git a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java index 797223fcbd..5e047c8bea 100644 --- a/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java +++ b/integration/spring-data/testsuite/webmvc/src/test/java/com/blazebit/persistence/spring/data/testsuite/webmvc/ReadOnlyDocumentRepositoryTest.java @@ -5,6 +5,20 @@ package com.blazebit.persistence.spring.data.testsuite.webmvc; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import com.blazebit.persistence.integration.view.spring.EnableEntityViews; import com.blazebit.persistence.spring.data.repository.BlazeSpecification; import com.blazebit.persistence.spring.data.repository.EntityViewSettingProcessor; @@ -24,25 +38,18 @@ import com.blazebit.persistence.spring.data.testsuite.webmvc.tx.TxWork; import com.blazebit.persistence.spring.data.testsuite.webmvc.view.DocumentView; import com.blazebit.persistence.testsuite.base.jpa.category.NoDB2; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoFirebird; -import com.blazebit.persistence.testsuite.base.jpa.category.NoHibernate42; import com.blazebit.persistence.testsuite.base.jpa.category.NoMySQL; import com.blazebit.persistence.testsuite.base.jpa.category.NoOracle; import com.blazebit.persistence.testsuite.base.jpa.category.NoPostgreSQL; -import com.blazebit.persistence.testsuite.base.jpa.category.NoSQLite; import com.blazebit.persistence.view.EntityViewManager; import com.blazebit.persistence.view.EntityViewSetting; import com.blazebit.persistence.view.Sorters; - -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.annotation.ComponentScan; @@ -56,17 +63,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import jakarta.persistence.EntityManager; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -106,9 +102,8 @@ public void initRepository() { } // NOTE: EclipseLink and DataNucleus seem to have a problem with the way Spring Data makes use of entity graphs, although it just uses the JPA APIs - // Hibernate 4.2 doesn't support the JPA 2.1 APIs that introduced entity graphs @Test - @Category({ NoHibernate42.class, NoEclipselink.class, NoDatanucleus.class }) + @Category({ NoEclipselink.class}) public void testFindD1EntityGraph() { // Given final Document d1 = createDocument("D1"); @@ -137,8 +132,7 @@ public void testFindD1NamedQuery() { @Test // We don't want to deal with the different casing requirements for table names in the various DBs so we only run // this test for H2. - // DataNucleus is not able to create entities from native query result sets. - @Category({NoDatanucleus.class, NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoSQLite.class, NoFirebird.class, NoDB2.class}) + @Category({ NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoDB2.class}) public void testFindD1Native() { // Given final Document d1 = createDocument("D1"); @@ -180,7 +174,7 @@ public void testFindD1NamedQueryProjection() { @Test // We don't want to deal with the different casing requirements for table names in the various DBs so we only run // this test for H2. - @Category({NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoSQLite.class, NoFirebird.class, NoDB2.class}) + @Category({NoPostgreSQL.class, NoOracle.class, NoMySQL.class, NoDB2.class}) public void testFindD1NativeProjection() { // Given final Document d1 = createDocument("D1"); @@ -856,9 +850,7 @@ public Predicate toPredicate(Root root, CriteriaQuery query, Criter } // Test for #1817 - // No idea what's wrong with Datanucleus @Test - @Category({ NoDatanucleus.class }) public void testFindByEnum() { // Given final Document d1 = createDocument("D1", "test", 0, null); diff --git a/integration/spring-hateoas/webmvc/pom.xml b/integration/spring-hateoas/webmvc/pom.xml index 1299257061..44c7ebdb4b 100644 --- a/integration/spring-hateoas/webmvc/pom.xml +++ b/integration/spring-hateoas/webmvc/pom.xml @@ -252,6 +252,26 @@ ${version.hibernate-6.6} + + eclipselink + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + + + hibernate-apt + + ${version.hibernate-apt} + + spring-data-3.1.x diff --git a/jpa-criteria/testsuite/pom.xml b/jpa-criteria/testsuite/pom.xml index 02d0c05f6c..03730f2cdf 100644 --- a/jpa-criteria/testsuite/pom.xml +++ b/jpa-criteria/testsuite/pom.xml @@ -239,6 +239,10 @@ org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + -AaddGeneratedAnnotation=false + diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java index 24f265cfd0..25a16412e5 100644 --- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java +++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/EmbeddableJoinTest.java @@ -5,11 +5,12 @@ package com.blazebit.persistence.criteria; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable; @@ -20,9 +21,6 @@ import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.NameObject; import com.blazebit.persistence.testsuite.entity.NameObject_; -import org.junit.Test; -import org.junit.experimental.categories.Category; - import jakarta.persistence.criteria.JoinType; import static org.junit.Assert.assertEquals; @@ -33,7 +31,7 @@ * @since 1.6.3 */ // NOTE: See EmbeddableComplexTest for details about why we need to ignore DataNucleus and EclipseLink -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoEclipselink.class }) public class EmbeddableJoinTest extends AbstractCoreTest { @Override diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java index 250c0e8790..bfb5dca214 100644 --- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java +++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinMapKeyEmbeddableTest.java @@ -5,13 +5,12 @@ package com.blazebit.persistence.criteria; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.base.jpa.category.NoOpenJPA; -import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps; -import com.blazebit.persistence.testsuite.entity.DocumentForEntityKeyMaps_; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityContainer; import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntityEmbeddable; @@ -21,13 +20,6 @@ import com.blazebit.persistence.testsuite.entity.EmbeddableTestEntity_; import com.blazebit.persistence.testsuite.entity.IntIdEntity; import com.blazebit.persistence.testsuite.entity.NameObject; -import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps; -import com.blazebit.persistence.testsuite.entity.PersonForEntityKeyMaps_; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.util.Map; import static org.junit.Assert.assertEquals; @@ -37,8 +29,7 @@ * @since 1.2.1 */ // NOTE: EclipseLink doesn't support Map in embeddables: https://bugs.eclipse.org/bugs/show_bug.cgi?id=391062 -// TODO: report that datanucleus doesn't support element collection in an embeddable -@Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class }) +@Category({ NoEclipselink.class }) public class JoinMapKeyEmbeddableTest extends AbstractCoreTest { @Override diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java index 6fa4b55aa5..bd3c6aee91 100644 --- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java +++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/JoinTest.java @@ -5,11 +5,6 @@ package com.blazebit.persistence.criteria; -import static org.junit.Assert.assertEquals; - -import jakarta.persistence.criteria.JoinType; - -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import org.junit.Test; import com.blazebit.persistence.CriteriaBuilder; @@ -18,7 +13,9 @@ import com.blazebit.persistence.testsuite.entity.Document_; import com.blazebit.persistence.testsuite.entity.Person; import com.blazebit.persistence.testsuite.entity.Person_; -import org.junit.experimental.categories.Category; +import jakarta.persistence.criteria.JoinType; + +import static org.junit.Assert.assertEquals; /** * @@ -123,8 +120,6 @@ public void listMapJoinWithFunctions() { } @Test - // TODO: Report that SingularAttributeImpl#getBindableType() returns ENTITY_TYPE instead of SINGULAR_ATTRIBUTE - @Category(NoDatanucleus.class) public void listStringMapEmbeddableJoinWithFunctions() { BlazeCriteriaQuery cq = BlazeCriteria.get(cbf, Long.class); BlazeCriteriaBuilder cb = cq.getCriteriaBuilder(); diff --git a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java index c33ed85820..0e217283d4 100644 --- a/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java +++ b/jpa-criteria/testsuite/src/test/java/com/blazebit/persistence/criteria/TreatTest.java @@ -5,15 +5,21 @@ package com.blazebit.persistence.criteria; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import com.blazebit.persistence.CriteriaBuilder; import com.blazebit.persistence.JoinType; import com.blazebit.persistence.testsuite.AbstractCoreTest; -import com.blazebit.persistence.testsuite.base.jpa.category.NoDatanucleus; import com.blazebit.persistence.testsuite.base.jpa.category.NoEclipselink; -import com.blazebit.persistence.testsuite.entity.*; -import org.junit.Test; -import org.junit.experimental.categories.Category; - +import com.blazebit.persistence.testsuite.entity.IntIdEntity; +import com.blazebit.persistence.testsuite.entity.PolymorphicBase; +import com.blazebit.persistence.testsuite.entity.PolymorphicBaseContainer; +import com.blazebit.persistence.testsuite.entity.PolymorphicBase_; +import com.blazebit.persistence.testsuite.entity.PolymorphicSub1; +import com.blazebit.persistence.testsuite.entity.PolymorphicSub1_; +import com.blazebit.persistence.testsuite.entity.PolymorphicSub2; +import com.blazebit.persistence.testsuite.entity.PolymorphicSub2_; import jakarta.persistence.Tuple; import static org.junit.Assert.assertEquals; @@ -80,7 +86,7 @@ public void treatRoot() { @Test // Eclipselink does not support dereferencing of TREAT join path elements - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void treatRootJoin() { BlazeCriteriaQuery cq = BlazeCriteria.get(cbf, PolymorphicBase.class); BlazeCriteriaBuilder cb = cq.getCriteriaBuilder(); @@ -143,7 +149,7 @@ public void treatJoin() { @Test // Eclipselink does not support dereferencing of TREAT join path elements - @Category({ NoDatanucleus.class, NoEclipselink.class }) + @Category({ NoEclipselink.class }) public void joinTreatedJoinWithOnClause() { BlazeCriteriaQuery cq = BlazeCriteria.get(cbf, Tuple.class); BlazeCriteriaBuilder cb = cq.getCriteriaBuilder(); diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus4.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus4.java deleted file mode 100644 index c74bd39f99..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus4.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoDatanucleus4 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoFirebird.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoFirebird.java deleted file mode 100644 index 93cd0cbc76..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoFirebird.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoFirebird { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate42.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate42.java deleted file mode 100644 index f287a4e351..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate42.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate42 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate43.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate43.java deleted file mode 100644 index 2cbed949b8..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate43.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate43 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate50.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate50.java deleted file mode 100644 index eacd660e86..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate50.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate50 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate51.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate51.java deleted file mode 100644 index a767b023a4..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate51.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate51 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate52.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate52.java deleted file mode 100644 index f9717f1ef3..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate52.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate52 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate53.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate53.java deleted file mode 100644 index 30aee79478..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate53.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate53 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate60.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate60.java deleted file mode 100644 index 8387585b76..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate60.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoHibernate60 { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoH2Latest.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate62.java similarity index 80% rename from testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoH2Latest.java rename to testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate62.java index caee2ed524..de87a6f828 100644 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoH2Latest.java +++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate62.java @@ -5,6 +5,6 @@ package com.blazebit.persistence.testsuite.base.jpa.category; -public interface NoH2Latest { +public interface NoHibernate62 { } diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate64.java similarity index 80% rename from testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus.java rename to testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate64.java index aaa4376d5c..a7d39fac76 100644 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoDatanucleus.java +++ b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoHibernate64.java @@ -5,6 +5,6 @@ package com.blazebit.persistence.testsuite.base.jpa.category; -public interface NoDatanucleus { +public interface NoHibernate64 { } diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoMySQLOld.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoMySQLOld.java deleted file mode 100644 index 91cc03410a..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoMySQLOld.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoMySQLOld { - -} diff --git a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoSQLite.java b/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoSQLite.java deleted file mode 100644 index 47d9c97f3a..0000000000 --- a/testsuite-base/jpa/src/main/java/com/blazebit/persistence/testsuite/base/jpa/category/NoSQLite.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * Copyright Blazebit - */ - -package com.blazebit.persistence.testsuite.base.jpa.category; - -public interface NoSQLite { - -}