From 6096bbdfa13f2e9bf2b3ab7137650d3ec9042f6c Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Fri, 10 Sep 2021 10:09:27 +0200 Subject: [PATCH] Move jpa.enhancement, jpa.graphs, jpa.ops, jpa.orphan, jpa.secondarytable, jpa.transaction, jpa.userguide, jpa.version and query.criteria packages --- .../enhancement/TestLazyPropertyOnPreUpdate.java | 2 +- .../{jpa/test => orm/test/jpa}/graphs/Company.java | 2 +- .../test/jpa}/graphs/CompanyFetchProfile.java | 2 +- .../{jpa/test => orm/test/jpa}/graphs/Course.java | 2 +- .../{jpa/test => orm/test/jpa}/graphs/Employee.java | 2 +- .../graphs/EntityGraphAttributeResolutionTest.java | 2 +- .../test/jpa}/graphs/EntityGraphTest.java | 2 +- .../test/jpa}/graphs/LoadAndFetchGraphTest.java | 10 +++++----- .../{jpa/test => orm/test/jpa}/graphs/Location.java | 2 +- .../{jpa/test => orm/test/jpa}/graphs/Manager.java | 2 +- .../{jpa/test => orm/test/jpa}/graphs/Market.java | 2 +- .../{jpa/test => orm/test/jpa}/graphs/Student.java | 3 +-- .../graphs/mappedbyid/FetchGraphFindByIdTest.java | 12 ++++++++++-- .../graphs/queryhint/QueryHintEntityGraphTest.java | 11 +++++++++-- .../test/jpa}/ops/MergeJpaComplianceTest.java | 2 +- .../DeleteMultiLevelOrphansTest.java | 2 +- .../onetoone/multilevelcascade/Preisregelung.java | 2 +- .../orphan/onetoone/multilevelcascade/Tranche.java | 2 +- .../onetoone/multilevelcascade/Tranchenmodell.java | 2 +- .../jpa}/orphan/onetoone/multilevelcascade/X.java | 2 +- .../jpa}/orphan/onetoone/multilevelcascade/Y.java | 2 +- .../AbstractNonOptionalSecondaryTableTest.java | 2 +- ...JoinedTableNullNonOptionalSecondaryTableTest.java | 2 +- ...SingleTableNullNonOptionalSecondaryTableTest.java | 2 +- .../{jpa/test => orm/test/jpa}/transaction/Book.java | 2 +- .../CloseEntityManagerWithActiveTransactionTest.java | 1 - .../jpa}/transaction/FlushAndTransactionTest.java | 2 +- .../jpa/transaction/SynchronizationTypeTest.java | 2 -- .../test/jpa/transaction/TransactionJoiningTest.java | 1 - .../{ => orm/test}/jpa/userguide/util/Article.java | 2 +- .../{ => orm/test}/jpa/userguide/util/Author.java | 2 +- .../{ => orm/test}/jpa/userguide/util/Book.java | 2 +- .../jpa/userguide/util/CopyrightableContent.java | 2 +- .../test}/jpa/userguide/util/GetIdentifierTest.java | 2 +- .../test}/jpa/userguide/util/IsLoadedTest.java | 2 +- .../userguide/util/PersistenceUtilHelperTest.java | 2 +- .../util/PessimisticNumberParserUnitTest.java | 2 +- .../test}/jpa/userguide/util/ProviderUtilTest.java | 2 +- .../{ => orm/test}/jpa/userguide/util/Sickness.java | 2 +- .../{ => orm/test}/jpa/userguide/util/Umbrella.java | 2 +- .../{ => orm/test}/jpa/version/Customer.java | 2 +- .../jpa/version/JpaSpecVersionValueUpdatingTest.java | 2 +- .../hibernate/{ => orm/test}/jpa/version/Order.java | 2 +- .../test}/query/criteria/internal/HHH13884Test.java | 3 +-- .../expression/SearchedCaseExpressionTest.java | 2 +- .../test}/query/criteria/internal/hhh11877/Foo.java | 2 +- .../criteria/internal/hhh11877/HHH111877Test.java | 3 ++- .../criteria/internal/hhh13058/HHH13058Test.java | 4 +++- .../query/criteria/internal/hhh13058/Patient.java | 2 +- .../test}/query/criteria/internal/hhh13058/Site.java | 2 +- .../test}/query/criteria/internal/hhh13058/Task.java | 2 +- .../query/criteria/internal/hhh13151/SideEntity.java | 2 +- .../query/criteria/internal/hhh13151/SubEntity.java | 2 +- .../criteria/internal/hhh13151/SuperEntity.java | 2 +- .../internal/hhh13151/TreatedEntityFetchTest.java | 2 +- .../test}/query/criteria/internal/hhh13908/Foo.java | 2 +- .../criteria/internal/hhh13908/HHH13908Test.java | 3 ++- .../internal/hhh14197/AbstractPersistent.java | 2 +- .../query/criteria/internal/hhh14197/Department.java | 2 +- .../query/criteria/internal/hhh14197/Employee.java | 2 +- .../criteria/internal/hhh14197/HHH14197Test.java | 5 ++--- 61 files changed, 84 insertions(+), 72 deletions(-) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/enhancement/TestLazyPropertyOnPreUpdate.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Company.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/CompanyFetchProfile.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Course.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Employee.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/EntityGraphAttributeResolutionTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/EntityGraphTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/LoadAndFetchGraphTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Location.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Manager.java (89%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Market.java (88%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/Student.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/mappedbyid/FetchGraphFindByIdTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/graphs/queryhint/QueryHintEntityGraphTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/ops/MergeJpaComplianceTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/orphan/onetoone/multilevelcascade/Preisregelung.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/orphan/onetoone/multilevelcascade/Tranche.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/orphan/onetoone/multilevelcascade/Tranchenmodell.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/orphan/onetoone/multilevelcascade/X.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/orphan/onetoone/multilevelcascade/Y.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/secondarytable/AbstractNonOptionalSecondaryTableTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/transaction/Book.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/transaction/FlushAndTransactionTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/Article.java (95%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/Author.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/Book.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/CopyrightableContent.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/GetIdentifierTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/IsLoadedTest.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/PersistenceUtilHelperTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/PessimisticNumberParserUnitTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/ProviderUtilTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/Sickness.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/userguide/util/Umbrella.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/version/Customer.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/version/JpaSpecVersionValueUpdatingTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/version/Order.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/HHH13884Test.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/expression/SearchedCaseExpressionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh11877/Foo.java (89%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh11877/HHH111877Test.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13058/HHH13058Test.java (96%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13058/Patient.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13058/Site.java (81%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13058/Task.java (93%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13151/SideEntity.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13151/SubEntity.java (91%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13151/SuperEntity.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13908/Foo.java (74%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh13908/HHH13908Test.java (92%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh14197/AbstractPersistent.java (88%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh14197/Department.java (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh14197/Employee.java (97%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/query/criteria/internal/hhh14197/HHH14197Test.java (92%) diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/enhancement/TestLazyPropertyOnPreUpdate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/enhancement/TestLazyPropertyOnPreUpdate.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java index 9719a0f673..052700707e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/enhancement/TestLazyPropertyOnPreUpdate.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Company.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Company.java index f523f2b090..636f326bd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Company.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/CompanyFetchProfile.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/CompanyFetchProfile.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CompanyFetchProfile.java index 8b13e2e53a..b43ef35424 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/CompanyFetchProfile.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Course.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Course.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Course.java index de964b154b..03d4509378 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Course.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Employee.java index 21ceb3eb3f..e586e7bc29 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Employee.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphAttributeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphAttributeResolutionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java index 6e3d7fabee..b31425edea 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphAttributeResolutionTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java index d9be82009f..201a3cc737 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphTest.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; import java.util.HashMap; import java.util.HashSet; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/LoadAndFetchGraphTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java index 58deac1bf9..7d5c2ae042 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/LoadAndFetchGraphTest.java +++ b/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 . */ -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() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Location.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Location.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Location.java index 59d226dd52..97101156e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Location.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Manager.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Manager.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Manager.java index f5e5efe577..3238bc7f9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Manager.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Market.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Market.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Market.java index e99375767f..0af4ea0ed4 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Market.java +++ b/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 . */ -package org.hibernate.jpa.test.graphs; +package org.hibernate.orm.test.jpa.graphs; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Student.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Student.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/Student.java index cddf7621fa..9a0414a6df 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/Student.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mappedbyid/FetchGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mappedbyid/FetchGraphFindByIdTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java index 31f7394901..caaf475d5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mappedbyid/FetchGraphFindByIdTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/queryhint/QueryHintEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/queryhint/QueryHintEntityGraphTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java index bfb7f3c66f..679ea2283d 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/queryhint/QueryHintEntityGraphTest.java +++ b/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 . */ -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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/ops/MergeJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/ops/MergeJpaComplianceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java index 1da7fd5534..7143f6062c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/ops/MergeJpaComplianceTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java index db621bb315..ee0bd5cbfc 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/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 . */ -package org.hibernate.jpa.test.orphan.onetoone.multilevelcascade; +package org.hibernate.orm.test.jpa.orphan.onetoone.multilevelcascade; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Preisregelung.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Preisregelung.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Preisregelung.java index 0a89feb16a..43824d850e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Preisregelung.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Tranche.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Tranche.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranche.java index 8431069f3e..adba14240c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Tranche.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Tranchenmodell.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Tranchenmodell.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Tranchenmodell.java index d9a373727d..80200fdd16 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Tranchenmodell.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/X.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/X.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/X.java index 576d7d5b12..8d77c78149 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/X.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Y.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Y.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/Y.java index e2c15ed759..455d2552bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/orphan/onetoone/multilevelcascade/Y.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/AbstractNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/AbstractNonOptionalSecondaryTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java index 31b8f549d6..3746e62a61 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/AbstractNonOptionalSecondaryTableTest.java +++ b/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 . */ -package org.hibernate.jpa.test.secondarytable; +package org.hibernate.orm.test.jpa.secondarytable; import java.util.Arrays; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java index 5dbb0e75a5..0f512e23ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/JoinedTableNullNonOptionalSecondaryTableTest.java +++ b/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 . */ -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-core/src/test/java/org/hibernate/jpa/test/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java index 13bceb4535..aa9793d078 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/secondarytable/SingleTableNullNonOptionalSecondaryTableTest.java +++ b/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 . */ -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-core/src/test/java/org/hibernate/jpa/test/transaction/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/transaction/Book.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/Book.java index 0759843fc5..8ac98863f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/transaction/Book.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java index e362bc413e..762043c910 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/CloseEntityManagerWithActiveTransactionTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/transaction/FlushAndTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/transaction/FlushAndTransactionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java index 6d7344945f..110c680fb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/transaction/FlushAndTransactionTest.java +++ b/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 . */ -package org.hibernate.jpa.test.transaction; +package org.hibernate.orm.test.jpa.transaction; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java index 3c6f16a8f0..fdf54e972a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/SynchronizationTypeTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java index 4f34889849..527a3e565f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionJoiningTest.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Article.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Article.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Article.java index 49dbf0b260..578dee824f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Article.java +++ b/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 . */ -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-core/src/test/java/org/hibernate/jpa/userguide/util/Author.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Author.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Author.java index d0048f24f2..96c7e92c9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Author.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Book.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Book.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Book.java index 9643722ded..1c3b6c79d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Book.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/CopyrightableContent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/CopyrightableContent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/CopyrightableContent.java index 9142b6789c..6076047557 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/CopyrightableContent.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/GetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/GetIdentifierTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java index d66db12a12..17012efa81 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/GetIdentifierTest.java +++ b/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 . */ -package org.hibernate.jpa.userguide.util; +package org.hibernate.orm.test.jpa.userguide.util; import javax.persistence.EntityManager; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/IsLoadedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/IsLoadedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java index bdca5b8690..f316768d6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/IsLoadedTest.java +++ b/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 . */ -package org.hibernate.jpa.userguide.util; +package org.hibernate.orm.test.jpa.userguide.util; import javax.persistence.EntityManager; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/PersistenceUtilHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/PersistenceUtilHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PersistenceUtilHelperTest.java index dd154e3f58..53048fe6a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/PersistenceUtilHelperTest.java +++ b/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 . */ -package org.hibernate.jpa.userguide.util; +package org.hibernate.orm.test.jpa.userguide.util; import javax.persistence.spi.LoadState; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/PessimisticNumberParserUnitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/PessimisticNumberParserUnitTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/PessimisticNumberParserUnitTest.java index 982d05acf2..a9c97ca883 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/PessimisticNumberParserUnitTest.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/ProviderUtilTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/ProviderUtilTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java index 10e14e8d3a..5a55a736d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/ProviderUtilTest.java +++ b/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 . */ -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/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Sickness.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Sickness.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Sickness.java index 86f44bf54f..2c693a6f59 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Sickness.java +++ b/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 . */ -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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Umbrella.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Umbrella.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/Umbrella.java index 57ec34ab5b..8a7c836c87 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/userguide/util/Umbrella.java +++ b/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 . */ -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; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Customer.java index 7883ccc81f..8c180ce788 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java +++ b/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 . */ -package org.hibernate.jpa.version; +package org.hibernate.orm.test.jpa.version; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java index 6202beeb70..838b75a587 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java +++ b/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 . */ -package org.hibernate.jpa.version; +package org.hibernate.orm.test.jpa.version; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/version/Order.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/version/Order.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/Order.java index be8a1a17fd..566e827aa2 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/version/Order.java +++ b/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 . */ -package org.hibernate.jpa.version; +package org.hibernate.orm.test.jpa.version; import javax.persistence.CascadeType; import javax.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/HHH13884Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/HHH13884Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/HHH13884Test.java index 6c5eac1e6a..0089791281 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/HHH13884Test.java +++ b/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 . */ -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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/expression/SearchedCaseExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/expression/SearchedCaseExpressionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/expression/SearchedCaseExpressionTest.java index f3bb936ad8..57b8f069d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/expression/SearchedCaseExpressionTest.java +++ b/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 . */ -package org.hibernate.query.criteria.internal.expression; +package org.hibernate.orm.test.query.criteria.internal.expression; import java.util.List; import javax.persistence.Column; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh11877/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java similarity index 89% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh11877/Foo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/Foo.java index efaeff9231..c0dc1ce649 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh11877/Foo.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh11877/HHH111877Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh11877/HHH111877Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java index e5af10a0b9..e34e152cb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh11877/HHH111877Test.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/HHH13058Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/HHH13058Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java index 1961ba60c4..94ae53c27b 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/HHH13058Test.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Patient.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Patient.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Patient.java index a314c5908f..15aec4cb9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Patient.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Site.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java similarity index 81% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Site.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Site.java index 3913ad5d6d..bf0fcdb69c 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Site.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Task.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Task.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/Task.java index 48a0ec56f3..d72d9dc3f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13058/Task.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SideEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SideEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SideEntity.java index b19e44e6ae..3f4868f19b 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SideEntity.java +++ b/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 . */ -package org.hibernate.query.criteria.internal.hhh13151; +package org.hibernate.orm.test.query.criteria.internal.hhh13151; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SubEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SubEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SubEntity.java index e517365212..46207f9eb5 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SubEntity.java +++ b/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 . */ -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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SuperEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SuperEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/SuperEntity.java index cca9d1e8b1..1847cb436f 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/SuperEntity.java +++ b/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 . */ -package org.hibernate.query.criteria.internal.hhh13151; +package org.hibernate.orm.test.query.criteria.internal.hhh13151; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java index 19a115bb82..55b8950b2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java +++ b/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 . */ -package org.hibernate.query.criteria.internal.hhh13151; +package org.hibernate.orm.test.query.criteria.internal.hhh13151; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13908/Foo.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java similarity index 74% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13908/Foo.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/Foo.java index f82cf14294..1123f8078e 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13908/Foo.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13908/HHH13908Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13908/HHH13908Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java index 42ade2e68b..e2a5f1fd1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh13908/HHH13908Test.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/AbstractPersistent.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/AbstractPersistent.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/AbstractPersistent.java index 8ab3a89042..b2b12c88a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/AbstractPersistent.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/Department.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/Department.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Department.java index f3ec2eb5d6..87c622a74d 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/Department.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/Employee.java index 20ef889104..e9414bce03 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/Employee.java +++ b/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; diff --git a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/HHH14197Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/HHH14197Test.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java index 42eb514cff..54125c311c 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/criteria/internal/hhh14197/HHH14197Test.java +++ b/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;