Various code cleanup

Author: sebersole

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

@@ -4,14 +4,11 @@
  */
 package org.hibernate.orm.test.jpa.criteria;
 
-import java.util.Date;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 /**
  * Animal
@@ -24,7 +21,6 @@ public class Animal {
 	private Animal mother;
 	private Animal father;
 	private String name;
-	private Date born;
 
 	public String getName() {
 		return name;
@@ -60,13 +56,4 @@ public Animal getFather() {
 	public void setFather(Animal father) {
 		this.father = father;
 	}
-
-	@Temporal(TemporalType.TIMESTAMP)
-	public Date getBorn() {
-		return born;
-	}
-
-	public void setBorn(Date born) {
-		this.born = born;
-	}
 }

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

@@ -5,7 +5,6 @@
 package org.hibernate.orm.test.jpa.criteria;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import jakarta.persistence.EntityManager;
@@ -21,6 +20,7 @@
 
 import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.CockroachDialect;
+import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.orm.test.jpa.metamodel.Address;
 import org.hibernate.orm.test.jpa.metamodel.Alias;
@@ -37,13 +37,14 @@
 import org.hibernate.orm.test.jpa.metamodel.Spouse;
 import org.hibernate.query.sqm.tree.predicate.SqmComparisonPredicate;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SkipForDialect;
+import org.hibernate.testing.transaction.TransactionUtil2;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
  * @author Steve Ebersole
@@ -282,36 +283,39 @@ public void testFunctionDialectFunctions() {
 
 	@Test
 	@JiraKey(value = "HHH-10737")
-	@FailureExpected(jiraKey = "HHH-10737")
 	public void testMissingDialectFunction() {
-		doInJPA( this::entityManagerFactory, em -> {
+		TransactionUtil2.inTransaction( entityManagerFactory(), (em) -> {
 			Human human = new Human();
 			human.setId( 200L );
 			human.setName( "2" );
-			human.setBorn( new Date() );
 			em.persist( human );
+		} );
 
-			em.getTransaction().commit();
-
+		TransactionUtil2.inTransaction( entityManagerFactory(), (em) -> {
 			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<HumanDTO> criteria = cb.createQuery( HumanDTO.class );
+			CriteriaQuery<Long> criteria = cb.createQuery( Long.class );
+
 			Root<Human> root = criteria.from( Human.class );
 
-			criteria.select(
-					cb.construct(
-							HumanDTO.class,
-							root.get( Human_.id ),
+			criteria.select( cb.count( cb.literal( 1 ) ) );
+
+			criteria.where(
+					cb.equal(
 							root.get( Human_.name ),
 							cb.function(
-									"convert",
+									"does_not_exist",
 									String.class,
-									root.get( Human_.born ),
-									cb.literal( 110 )
+									root.get( Human_.id )
 							)
 					)
 			);
 
-			em.createQuery( criteria ).getResultList();
+			try {
+				em.createQuery( criteria ).getResultList();
+				fail( "Expecting a SQLGrammarException" );
+			}
+			catch (SQLGrammarException expected) {
+			}
 		} );
 	}