Move jpa.enhancement, jpa.graphs, jpa.ops, jpa.orphan, jpa.secondarytable, jpa.transaction, jpa.userguide, jpa.version and query.criteria packages

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.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.enhancement;
+package org.hibernate.orm.test.jpa.enhancement;
 
 import org.hibernate.Hibernate;
 import org.hibernate.cfg.AvailableSettings;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.HashSet;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfile;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.ArrayList;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.HashSet;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java

@@ -1,4 +1,4 @@
-package org.hibernate.jpa.test.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.EnumSet;
 import java.util.HashSet;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.HashMap;
 import java.util.HashSet;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -236,8 +236,8 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase {
 					// depending on the mapping.
 					assertTrue( Hibernate.isInitialized( cEntity.getEagerC() ) );
 
-					// 1 + 1 for the eager C
-					assertEquals( 2L, statistics.getPrepareStatementCount() );
+					// 1 because contrary to 5.x we fetch the eager C along with the main query
+					assertEquals( 1L, statistics.getPrepareStatementCount() );
 				} );
 	}
 
@@ -340,8 +340,8 @@ public class LoadAndFetchGraphTest extends BaseEntityManagerFunctionalTestCase {
 				assertTrue( Hibernate.isInitialized( cEntity.getEagerC() ) );
 			}
 
-			// 1 + 2 for the eager C
-			assertEquals( 3L, statistics.getPrepareStatementCount() );
+			// 1 because contrary to 5.x we fetch the eager C along with the main query
+			assertEquals( 1L, statistics.getPrepareStatementCount() );
 		} );
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import javax.persistence.Entity;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java

@@ -4,13 +4,12 @@
  * 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.graphs;
+package org.hibernate.orm.test.jpa.graphs;
 
 import java.util.Set;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java

@@ -1,9 +1,17 @@
-package org.hibernate.jpa.test.graphs.mappedbyid;
+package org.hibernate.orm.test.jpa.graphs.mappedbyid;
 
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.jpa.test.graphs.*;
+import org.hibernate.orm.test.jpa.graphs.Company;
+import org.hibernate.orm.test.jpa.graphs.CompanyFetchProfile;
+import org.hibernate.orm.test.jpa.graphs.Course;
+import org.hibernate.orm.test.jpa.graphs.Employee;
+import org.hibernate.orm.test.jpa.graphs.Location;
+import org.hibernate.orm.test.jpa.graphs.Manager;
+import org.hibernate.orm.test.jpa.graphs.Market;
+import org.hibernate.orm.test.jpa.graphs.Student;
+
 import org.hibernate.testing.TestForIssue;
 import org.junit.Before;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.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.graphs.queryhint;
+package org.hibernate.orm.test.jpa.graphs.queryhint;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -19,7 +19,14 @@ import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.jpa.QueryHints;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.jpa.test.graphs.*;
+import org.hibernate.orm.test.jpa.graphs.Company;
+import org.hibernate.orm.test.jpa.graphs.CompanyFetchProfile;
+import org.hibernate.orm.test.jpa.graphs.Course;
+import org.hibernate.orm.test.jpa.graphs.Employee;
+import org.hibernate.orm.test.jpa.graphs.Location;
+import org.hibernate.orm.test.jpa.graphs.Manager;
+import org.hibernate.orm.test.jpa.graphs.Market;
+import org.hibernate.orm.test.jpa.graphs.Student;
 
 import org.hibernate.testing.TestForIssue;
 import org.junit.Before;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java

@@ -1,4 +1,4 @@
-package org.hibernate.jpa.test.ops;
+package org.hibernate.orm.test.jpa.ops;
 
 import java.io.Serializable;
 import java.util.ArrayList;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.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.orphan.onetoone.multilevelcascade;
+package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
 import java.util.List;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.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.orphan.onetoone.multilevelcascade;
+package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.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.orphan.onetoone.multilevelcascade;
+package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.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.orphan.onetoone.multilevelcascade;
+package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
 import java.util.ArrayList;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.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.orphan.onetoone.multilevelcascade;
+package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.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.orphan.onetoone.multilevelcascade;
+package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.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.secondarytable;
+package org.hibernate.orm.test.jpa.secondarytable;
 
 import java.util.Arrays;
 import java.util.Map;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.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.secondarytable;
+package org.hibernate.orm.test.jpa.secondarytable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.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.secondarytable;
+package org.hibernate.orm.test.jpa.secondarytable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java

@@ -6,7 +6,7 @@
  */
 
 //$Id$
-package org.hibernate.jpa.test.transaction;
+package org.hibernate.orm.test.jpa.transaction;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java

@@ -27,7 +27,6 @@ import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl;
 import org.hibernate.internal.SessionImpl;
-import org.hibernate.jpa.test.transaction.Book;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.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.transaction;
+package org.hibernate.orm.test.jpa.transaction;
 
 import java.util.List;
 import java.util.Map;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java

@@ -18,8 +18,6 @@ import javax.transaction.TransactionManager;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
-import org.hibernate.jpa.test.transaction.Book;
-import org.hibernate.jpa.test.transaction.Book_;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
 
 import org.hibernate.testing.TestForIssue;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java

@@ -18,7 +18,6 @@ import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
 import org.hibernate.internal.SessionImpl;
-import org.hibernate.jpa.test.transaction.Book;
 import org.hibernate.orm.test.jpa.txn.JtaTransactionJoiningTest;
 import org.hibernate.resource.transaction.backend.jta.internal.JtaTransactionCoordinatorImpl;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 
 import java.io.Serializable;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 
 import javax.persistence.EntityManager;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 
 import javax.persistence.EntityManager;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 
 import javax.persistence.spi.LoadState;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 
 import javax.persistence.Persistence;
 import javax.persistence.spi.LoadState;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 import java.io.Serializable;
 import java.util.Date;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.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.userguide.util;
+package org.hibernate.orm.test.jpa.userguide.util;
 import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.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.version;
+package org.hibernate.orm.test.jpa.version;
 
 import java.util.ArrayList;
 import java.util.List;

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.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.version;
+package org.hibernate.orm.test.jpa.version;
 
 import org.junit.Test;
 

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.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.version;
+package org.hibernate.orm.test.jpa.version;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java

@@ -4,9 +4,8 @@
  * 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.query.criteria.internal;
+package org.hibernate.orm.test.query.criteria.internal;
 
-import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Order;
 
 import org.hibernate.query.sqm.tree.expression.SqmExpression;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.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.query.criteria.internal.expression;
+package org.hibernate.orm.test.query.criteria.internal.expression;
 
 import java.util.List;
 import javax.persistence.Column;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh11877;
+package org.hibernate.orm.test.query.criteria.internal.hhh11877;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh11877;
+package org.hibernate.orm.test.query.criteria.internal.hhh11877;
 
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -6,6 +6,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.query.criteria.internal.hhh11877.Foo_;
 
 import org.hibernate.testing.TestForIssue;
 import org.junit.Test;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh13058;
+package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -12,6 +12,8 @@ import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.query.criteria.internal.hhh13058.Patient_;
+import org.hibernate.query.criteria.internal.hhh13058.Task_;
 
 import org.hibernate.testing.TestForIssue;
 import org.junit.Before;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh13058;
+package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh13058;
+package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh13058;
+package org.hibernate.orm.test.query.criteria.internal.hhh13058;
 
 import java.util.Objects;
 import javax.persistence.Entity;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.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.query.criteria.internal.hhh13151;
+package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.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.query.criteria.internal.hhh13151;
+package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
 import org.hibernate.annotations.*;
 import org.hibernate.annotations.CascadeType;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.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.query.criteria.internal.hhh13151;
+package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.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.query.criteria.internal.hhh13151;
+package org.hibernate.orm.test.query.criteria.internal.hhh13151;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh13908;
+package org.hibernate.orm.test.query.criteria.internal.hhh13908;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh13908;
+package org.hibernate.orm.test.query.criteria.internal.hhh13908;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -6,6 +6,7 @@ import javax.persistence.criteria.Root;
 
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.query.criteria.internal.hhh13908.Foo_;
 
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.TestForIssue;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh14197;
+package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh14197;
+package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import java.util.HashSet;
 import java.util.Set;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java

@@ -1,4 +1,4 @@
-package org.hibernate.query.criteria.internal.hhh14197;
+package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import java.util.Date;
 import java.util.HashMap;

hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java

@@ -1,15 +1,14 @@
-package org.hibernate.query.criteria.internal.hhh14197;
+package org.hibernate.orm.test.query.criteria.internal.hhh14197;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.MapJoin;
 import javax.persistence.criteria.Root;
 import javax.persistence.criteria.SetJoin;
 import javax.persistence.criteria.Subquery;
 
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.query.criteria.internal.hhh14197.Employee_;
 
-import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.junit.Test;