Move jpa.enhancement, jpa.graphs, jpa.ops, jpa.orphan, jpa.secondaryt…

…able, jpa.transaction, jpa.userguide, jpa.version and query.criteria packages
hibernate · Sep 23, 2021 · 6096bbd · 6096bbd
1 parent 5df67d8
commit 6096bbd
Show file tree

Hide file tree

Showing 61 changed files with 84 additions and 72 deletions.
diff --git a/...ancement/TestLazyPropertyOnPreUpdate.java → ...ancement/TestLazyPropertyOnPreUpdate.java b/...ancement/TestLazyPropertyOnPreUpdate.java → ...ancement/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;

diff --git a/...rg/hibernate/jpa/test/graphs/Company.java → ...ibernate/orm/test/jpa/graphs/Company.java b/...rg/hibernate/jpa/test/graphs/Company.java → ...ibernate/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;

diff --git a/.../jpa/test/graphs/CompanyFetchProfile.java → .../test/jpa/graphs/CompanyFetchProfile.java b/.../jpa/test/graphs/CompanyFetchProfile.java → .../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;

diff --git a/...org/hibernate/jpa/test/graphs/Course.java → ...hibernate/orm/test/jpa/graphs/Course.java b/...org/hibernate/jpa/test/graphs/Course.java → ...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;

diff --git a/...g/hibernate/jpa/test/graphs/Employee.java → ...bernate/orm/test/jpa/graphs/Employee.java b/...g/hibernate/jpa/test/graphs/Employee.java → ...bernate/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;

diff --git a/...s/EntityGraphAttributeResolutionTest.java → ...s/EntityGraphAttributeResolutionTest.java b/...s/EntityGraphAttributeResolutionTest.java → ...s/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;

diff --git a/...nate/jpa/test/graphs/EntityGraphTest.java → .../orm/test/jpa/graphs/EntityGraphTest.java b/...nate/jpa/test/graphs/EntityGraphTest.java → .../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;

diff --git a/...pa/test/graphs/LoadAndFetchGraphTest.java → ...est/jpa/graphs/LoadAndFetchGraphTest.java b/...pa/test/graphs/LoadAndFetchGraphTest.java → ...est/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 void testQueryByIdWithLoadGraph() {
 					// 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 void testQueryByIdWithLoadGraphMultipleResults() {
 				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() );
 		} );
 	}
 

diff --git a/...g/hibernate/jpa/test/graphs/Location.java → ...bernate/orm/test/jpa/graphs/Location.java b/...g/hibernate/jpa/test/graphs/Location.java → ...bernate/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;

diff --git a/...rg/hibernate/jpa/test/graphs/Manager.java → ...ibernate/orm/test/jpa/graphs/Manager.java b/...rg/hibernate/jpa/test/graphs/Manager.java → ...ibernate/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;
 

diff --git a/...org/hibernate/jpa/test/graphs/Market.java → ...hibernate/orm/test/jpa/graphs/Market.java b/...org/hibernate/jpa/test/graphs/Market.java → ...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;
 
 
 /**

diff --git a/...rg/hibernate/jpa/test/graphs/Student.java → ...ibernate/orm/test/jpa/graphs/Student.java b/...rg/hibernate/jpa/test/graphs/Student.java → ...ibernate/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;

diff --git a/...hs/mappedbyid/FetchGraphFindByIdTest.java → ...hs/mappedbyid/FetchGraphFindByIdTest.java b/...hs/mappedbyid/FetchGraphFindByIdTest.java → ...hs/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;

diff --git a/...s/queryhint/QueryHintEntityGraphTest.java → ...s/queryhint/QueryHintEntityGraphTest.java b/...s/queryhint/QueryHintEntityGraphTest.java → ...s/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.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;

diff --git a/.../jpa/test/ops/MergeJpaComplianceTest.java → .../test/jpa/ops/MergeJpaComplianceTest.java b/.../jpa/test/ops/MergeJpaComplianceTest.java → .../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;

diff --git a/...lcascade/DeleteMultiLevelOrphansTest.java → ...lcascade/DeleteMultiLevelOrphansTest.java b/...lcascade/DeleteMultiLevelOrphansTest.java → ...lcascade/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;
 

diff --git a/...oone/multilevelcascade/Preisregelung.java → ...oone/multilevelcascade/Preisregelung.java b/...oone/multilevelcascade/Preisregelung.java → ...oone/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;

diff --git a/...n/onetoone/multilevelcascade/Tranche.java → ...n/onetoone/multilevelcascade/Tranche.java b/...n/onetoone/multilevelcascade/Tranche.java → ...n/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;

diff --git a/...one/multilevelcascade/Tranchenmodell.java → ...one/multilevelcascade/Tranchenmodell.java b/...one/multilevelcascade/Tranchenmodell.java → ...one/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;

diff --git a/.../orphan/onetoone/multilevelcascade/X.java → .../orphan/onetoone/multilevelcascade/X.java b/.../orphan/onetoone/multilevelcascade/X.java → .../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;

diff --git a/.../orphan/onetoone/multilevelcascade/Y.java → .../orphan/onetoone/multilevelcascade/Y.java b/.../orphan/onetoone/multilevelcascade/Y.java → .../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;

diff --git a/...bstractNonOptionalSecondaryTableTest.java → ...bstractNonOptionalSecondaryTableTest.java b/...bstractNonOptionalSecondaryTableTest.java → ...bstractNonOptionalSecondaryTableTest.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;

diff --git a/...bleNullNonOptionalSecondaryTableTest.java → ...bleNullNonOptionalSecondaryTableTest.java b/...bleNullNonOptionalSecondaryTableTest.java → ...bleNullNonOptionalSecondaryTableTest.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;

diff --git a/...bleNullNonOptionalSecondaryTableTest.java → ...bleNullNonOptionalSecondaryTableTest.java b/...bleNullNonOptionalSecondaryTableTest.java → ...bleNullNonOptionalSecondaryTableTest.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;

diff --git a/.../hibernate/jpa/test/transaction/Book.java → ...ernate/orm/test/jpa/transaction/Book.java b/.../hibernate/jpa/test/transaction/Book.java → ...ernate/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;

diff --git a/...a/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java b/...a/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java
@@ -27,7 +27,6 @@
 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;

diff --git a/.../transaction/FlushAndTransactionTest.java → .../transaction/FlushAndTransactionTest.java b/.../transaction/FlushAndTransactionTest.java → .../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;

diff --git a/...te-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java b/...te-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java
@@ -18,8 +18,6 @@
 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;

diff --git a/...ate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java b/...ate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java
@@ -18,7 +18,6 @@
 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;
 

diff --git a/...hibernate/jpa/userguide/util/Article.java → .../orm/test/jpa/userguide/util/Article.java b/...hibernate/jpa/userguide/util/Article.java → .../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;

diff --git a/.../hibernate/jpa/userguide/util/Author.java → ...e/orm/test/jpa/userguide/util/Author.java b/.../hibernate/jpa/userguide/util/Author.java → ...e/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;

diff --git a/...rg/hibernate/jpa/userguide/util/Book.java → ...ate/orm/test/jpa/userguide/util/Book.java b/...rg/hibernate/jpa/userguide/util/Book.java → ...ate/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;

diff --git a/.../userguide/util/CopyrightableContent.java → .../userguide/util/CopyrightableContent.java b/.../userguide/util/CopyrightableContent.java → .../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;

diff --git a/...jpa/userguide/util/GetIdentifierTest.java → ...jpa/userguide/util/GetIdentifierTest.java b/...jpa/userguide/util/GetIdentifierTest.java → ...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;
 

diff --git a/...nate/jpa/userguide/util/IsLoadedTest.java → ...test/jpa/userguide/util/IsLoadedTest.java b/...nate/jpa/userguide/util/IsLoadedTest.java → ...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;
 

diff --git a/...guide/util/PersistenceUtilHelperTest.java → ...guide/util/PersistenceUtilHelperTest.java b/...guide/util/PersistenceUtilHelperTest.java → ...guide/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;
 

diff --git a/...util/PessimisticNumberParserUnitTest.java → ...util/PessimisticNumberParserUnitTest.java b/...util/PessimisticNumberParserUnitTest.java → ...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;

diff --git a/.../jpa/userguide/util/ProviderUtilTest.java → .../jpa/userguide/util/ProviderUtilTest.java b/.../jpa/userguide/util/ProviderUtilTest.java → .../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;

diff --git a/...ibernate/jpa/userguide/util/Sickness.java → ...orm/test/jpa/userguide/util/Sickness.java b/...ibernate/jpa/userguide/util/Sickness.java → ...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;