HHH-17493 - Merge WithJpaComplianceNegatedPredicateTest into NegatedPredicateTest (possible now after the merge of PR hibernate#7990)

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/NegatedPredicateTest.java

@@ -25,10 +25,6 @@
 /**
  * @author Jan Schatteman
  */
-@Jpa(
-		annotatedClasses = {Wall.class},
-		jpaComplianceEnabled = false
-)
 @JiraKey( value = "HHH-17493" )
 public class NegatedPredicateTest {
 
@@ -56,6 +52,10 @@ public void tearDown(EntityManagerFactoryScope scope) {
 		);
 	}
 
+	@Jpa(
+			annotatedClasses = {Wall.class},
+			jpaComplianceEnabled = false
+	)
 	@Test
 	public void testNegatedPredicate(EntityManagerFactoryScope scope) {
 		scope.inEntityManager(
@@ -78,6 +78,10 @@ public void testNegatedPredicate(EntityManagerFactoryScope scope) {
 		);
 	}
 
+	@Jpa(
+			annotatedClasses = {Wall.class},
+			jpaComplianceEnabled = false
+	)
 	@Test
 	public void testDoubleNegatedPredicate(EntityManagerFactoryScope scope) {
 		scope.inEntityManager(
@@ -103,4 +107,61 @@ public void testDoubleNegatedPredicate(EntityManagerFactoryScope scope) {
 				}
 		);
 	}
+
+	@Jpa(
+			annotatedClasses = {Wall.class},
+			jpaComplianceEnabled = true
+	)
+	@Test
+	public void testJpaCompliantNegatedPredicate(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+					CriteriaQuery<Wall> query = cb.createQuery( Wall.class );
+					Root<Wall> root = query.from( Wall.class );
+					query.select( root ).where(
+							cb.not(
+									cb.or(
+											cb.equal(root.get( "color" ), "yellow"),
+											cb.equal(root.get( "color" ), "red")
+									)
+							)
+					);
+					Wall result = entityManager.createQuery( query ).getSingleResult();
+					assertNotNull( result );
+					assertEquals("green", result.getColor());
+				}
+		);
+	}
+
+	@Jpa(
+			annotatedClasses = {Wall.class},
+			jpaComplianceEnabled = true
+	)
+	@Test
+	public void testJpaCompliantDoubleNegatedPredicate(EntityManagerFactoryScope scope) {
+		scope.inEntityManager(
+				entityManager -> {
+					CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+					CriteriaQuery<Wall> query = cb.createQuery( Wall.class );
+					Root<Wall> root = query.from( Wall.class );
+					query.select( root ).where(
+							cb.not(
+									cb.not(
+											cb.or(
+													cb.equal(root.get( "color" ), "yellow"),
+													cb.equal(root.get( "color" ), "red")
+											)
+									)
+							)
+					);
+					query.orderBy( cb.asc(root.get("id")) );
+					List<Wall> result = entityManager.createQuery( query ).getResultList();
+					assertEquals( 2, result.size() );
+					assertEquals("yellow", result.get(0).getColor());
+					assertEquals("red", result.get(1).getColor());
+				}
+		);
+	}
+
 }