Throw IllegalArgumentException when cannot resolve attribute names

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java

@@ -143,7 +143,7 @@ public abstract class AbstractSqmPath<T> extends AbstractSqmExpression<T> implem
 		final SqmPathSource<?> subNavigable = getReferencedPathSource().findSubPathSource( attributeName );
 
 		if ( subNavigable == null ) {
-			throw new SemanticException(
+			throw new IllegalArgumentException(
 					String.format(
 							"Could not resolve attribute '%s' of '%s'",
 							attributeName, getNavigablePath()

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/IllegalArgumentExceptionTest.java

@@ -0,0 +1,118 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.orm.test.jpa.compliance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Selection;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+@Jpa(
+		annotatedClasses = IllegalArgumentExceptionTest.Person.class
+)
+public class IllegalArgumentExceptionTest {
+
+	@Test
+	public void testCriteriaTupleQuerySameAlias(EntityManagerFactoryScope scope) {
+
+		final CriteriaQuery<Tuple> query = scope.getEntityManagerFactory().getCriteriaBuilder().createTupleQuery();
+		final Root<Person> person = query.from( Person.class );
+
+		try {
+			List list = new ArrayList();
+			list.add( person.get( "id" ).alias( "a" ) );
+			list.add( person.get( "name" ).alias( "a" ) );
+
+			query.multiselect( list );
+			fail( "TCK expects an IllegalArgumentException" );
+		}
+		catch (IllegalArgumentException iae) {
+			//expected by TCK
+		}
+	}
+
+	@Test
+	public void testCriteriaTupleQuerySameAlias1(EntityManagerFactoryScope scope) {
+
+		final CriteriaQuery<Tuple> query = scope.getEntityManagerFactory().getCriteriaBuilder().createTupleQuery();
+		final Root<Person> person = query.from( Person.class );
+
+		Selection[] selection = {
+				person.get( "id" ).alias( "a" ),
+				person.get( "name" ).alias( "a" )
+		};
+
+		try {
+			query.multiselect( selection );
+			fail( "TCK expects an IllegalArgumentException" );
+		}
+		catch (IllegalArgumentException iae) {
+			//expected by TCK
+		}
+	}
+
+	@Test
+	public void testCriteriaTupleQueryNonExistingAttributeNames(EntityManagerFactoryScope scope) {
+
+		final CriteriaQuery<Tuple> query = scope.getEntityManagerFactory().getCriteriaBuilder().createTupleQuery();
+		final Root<Person> person = query.from( Person.class );
+
+		try {
+			query.multiselect(
+					person.get( "not_existing" ).alias( "a1" ),
+					person.get( "another_not_existing" ).alias( "a2" )
+			);
+			fail( "TCK expects an IllegalArgumentException" );
+		}
+		catch (IllegalArgumentException iae) {
+			// expected
+		}
+	}
+
+	@Test
+	public void testCriteriaStringQuery(EntityManagerFactoryScope scope) {
+
+		final CriteriaQuery<String> query = scope.getEntityManagerFactory().getCriteriaBuilder().createQuery( String.class );
+		try {
+			final Root<Person> person = query.from( Person.class );
+			person.get( "not_existing" );
+
+			fail( "TCK expects an IllegalArgumentException" );
+		}
+		catch (IllegalArgumentException iae) {
+			//expected by TCK
+		}
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+
+		@Id
+		private Integer id;
+
+		private String name;
+
+		Person() {
+		}
+
+		public Person(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+	}
+}

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

@@ -17,7 +17,6 @@ import org.hibernate.orm.test.jpa.metamodel.Order;
 import org.hibernate.orm.test.jpa.metamodel.Thing;
 import org.hibernate.orm.test.jpa.metamodel.ThingWithQuantity;
 
-import org.hibernate.query.SemanticException;
 import org.hibernate.testing.orm.junit.ExpectedException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -67,7 +66,7 @@ public class AbstractPathImplTest extends AbstractMetamodelSpecificTest {
         em.close();
     }
 
-	@ExpectedException(value = SemanticException.class)
+	@ExpectedException(value = IllegalArgumentException.class)
 	@Test
 	public void testGetNonExistingAttributeViaName() {
 		EntityManager em = getOrCreateEntityManager();