Move jpa.test.query to orm.test

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
 import static org.junit.Assert.assertEquals;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java

@@ -4,11 +4,13 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 
+import org.hibernate.jpa.test.query.Employee;
+
 /**
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
  */

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.util.Date;
 import java.util.GregorianCalendar;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.util.List;
 import java.util.Map;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.util.List;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.util.List;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.math.BigDecimal;
 import java.sql.Blob;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.util.Date;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.io.Serializable;
 import java.sql.PreparedStatement;
@@ -114,7 +114,7 @@ public class QueryParametersValidationTest extends BaseEntityManagerFunctionalTe
 		@GeneratedValue(strategy = GenerationType.AUTO)
 		private Long id;
 
-		@Type(type = "org.hibernate.jpa.test.query.QueryParametersValidationTest$BooleanUserType")
+		@Type(type = "org.hibernate.orm.test.jpa.query.QueryParametersValidationTest$BooleanUserType")
 		private boolean active;
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,6 +35,7 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.jpa.test.Distributor;
 import org.hibernate.jpa.test.Item;
 import org.hibernate.jpa.test.Wallet;
+import org.hibernate.jpa.test.query.Employee;
 import org.hibernate.stat.Statistics;
 
 import org.hibernate.testing.SkipForDialect;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java

@@ -4,7 +4,7 @@
  * 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.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import static org.junit.Assert.assertEquals;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java

@@ -1,4 +1,4 @@
-package org.hibernate.jpa.test.query;
+package org.hibernate.orm.test.jpa.query;
 
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;

hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java

@@ -33,7 +33,7 @@ public class NamedQueryTest extends BaseCoreFunctionalTestCase {
 
 	@Override
 	public Class[] getAnnotatedClasses() {
-		return new Class[] {org.hibernate.jpa.test.query.NamedQueryTest.Game.class};
+		return new Class[] { org.hibernate.orm.test.jpa.query.NamedQueryTest.Game.class};
 	}
 
 	@Before
@@ -41,7 +41,7 @@ public class NamedQueryTest extends BaseCoreFunctionalTestCase {
 			throws Exception {
 		doInHibernate( this::sessionFactory, session -> {
 			for ( String title : GAME_TITLES ) {
-				org.hibernate.jpa.test.query.NamedQueryTest.Game game = new org.hibernate.jpa.test.query.NamedQueryTest.Game(
+				org.hibernate.orm.test.jpa.query.NamedQueryTest.Game game = new org.hibernate.orm.test.jpa.query.NamedQueryTest.Game(
 						title );
 				session.save( game );
 			}