add more tests for specification enhancements

Author: gavinking

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/update/SqmSetClause.java

@@ -5,7 +5,6 @@
 package org.hibernate.query.sqm.tree.update;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 

hibernate-core/src/test/java/org/hibernate/orm/test/query/assignment/AssignmentTest.java

@@ -173,6 +173,36 @@ void tearDown(SessionFactoryScope scope) {
 
 	}
 
+	@Test void testCriteriaDelete(SessionFactoryScope scope) {
+		var bookType = scope.getSessionFactory().getJpaMetamodel().findEntityType(Book.class);
+		assertNotNull(  bookType );
+		@SuppressWarnings("unchecked")
+		var title =
+				(SingularAttribute<? super Book, String>)
+						bookType.findSingularAttribute("title");
+		@SuppressWarnings("unchecked")
+		var isbn =
+				(SingularAttribute<? super Book, String>)
+						bookType.findSingularAttribute("isbn");
+
+		scope.inTransaction( session -> {
+			var builder = session.getCriteriaBuilder();
+			var query = builder.createCriteriaDelete( Book.class );
+			var root = query.from( Book.class );
+			DeleteSpecification.create( query )
+					.restrict( Restriction.startsWith( title, "Hibernate" ) )
+					.createQuery( session )
+					.executeUpdate();
+			var list =
+					SimpleProjectionSpecification.create( SelectionSpecification.create( Book.class ), isbn )
+							.createQuery( session )
+							.getResultList();
+			assertEquals( 1, list.size() );
+			assertEquals( "9781617290459", list.get( 0 ) );
+		} );
+
+	}
+
 	@Entity(name="Book")
 	static class Book {
 		@Id String isbn;

hibernate-core/src/test/java/org/hibernate/orm/test/query/dynamic/OtherEntity.java

@@ -12,5 +12,5 @@
 @Table(name = "OtherEntity")
 public class OtherEntity {
 	@Id
-	private Integer id;
+	Integer id;
 }

hibernate-core/src/test/java/org/hibernate/orm/test/query/dynamic/ProjectionSpecificationTest.java

@@ -12,7 +12,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Steve Ebersole
@@ -25,7 +25,9 @@ public class ProjectionSpecificationTest {
 	@BeforeAll
 	public static void setup(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {
-			session.createMutationQuery( "insert BasicEntity (id, name, position) values (1, 'Gavin', 2)" )
+			session.createMutationQuery( "insert OtherEntity (id) values (69)" )
+					.executeUpdate();
+			session.createMutationQuery( "insert BasicEntity (id, name, position, other) values (1, 'Gavin', 2, (select o from OtherEntity o where o.id = 69))" )
 					.executeUpdate();
 		} );
 	}
@@ -43,7 +45,7 @@ void testProjection(SessionFactoryScope factoryScope) {
 			assertEquals( 2, position.in(tuple) );
 			assertEquals( "Gavin", name.in(tuple) );
 			assertEquals( 1, id.in(tuple) );
-			assertNull( otherId.in( tuple ) );
+			assertEquals( 69, otherId.in( tuple ) );
 		});
 	}
 
@@ -67,7 +69,29 @@ void testSimpleProjectionPath(SessionFactoryScope factoryScope) {
 									.to( BasicEntity_.other )
 									.to( OtherEntity_.id ) );
 			var id = projection.createQuery( session ).getSingleResult();
-			assertNull( id );
+			assertEquals( 69, id );
+		});
+	}
+
+	@Test
+	void testSimpleEntityProjection(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var spec = SelectionSpecification.create( BasicEntity.class );
+			var projection = spec.createProjection( BasicEntity_.other );
+			var otherEntity = projection.createQuery( session ).getSingleResult();
+			assertNotNull( otherEntity );
+			assertEquals( 69, otherEntity.id );
+		});
+	}
+
+	@Test
+	void testSimpleEntityProjectionPath(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			var spec = SelectionSpecification.create( BasicEntity.class );
+			var projection = spec.createProjection( Path.from(BasicEntity.class).to(BasicEntity_.other) );
+			var otherEntity = projection.createQuery( session ).getSingleResult();
+			assertNotNull( otherEntity );
+			assertEquals( 69, otherEntity.id );
 		});
 	}
 }