From d4ecfbc1b84593c3e8eecf66d3ae1a0afeafb551 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Tue, 28 Sep 2021 09:57:27 +0200 Subject: [PATCH] Move jpa.test.query to orm.test --- .../test/jpa}/query/ConstructorResultNativeQueryTest.java | 2 +- .../{jpa/test => orm/test/jpa}/query/Contractor.java | 4 +++- .../test => orm/test/jpa}/query/DateTimeParameterTest.java | 2 +- .../test => orm/test/jpa}/query/NamedQueryCommentTest.java | 2 +- .../{jpa/test => orm/test/jpa}/query/NamedQueryTest.java | 2 +- .../test/jpa}/query/NativeQueryOrdinalParametersTest.java | 2 +- .../jpa}/query/NativeQueryResultTypeAutoDiscoveryTest.java | 2 +- .../test => orm/test/jpa}/query/NullParameterQueryTest.java | 2 +- .../jpa}/query/OracleConstructorResultNativeQueryTest.java | 2 +- .../test/jpa}/query/QueryParametersValidationTest.java | 4 ++-- .../hibernate/{jpa/test => orm/test/jpa}/query/QueryTest.java | 3 ++- .../jpa}/query/QueryWithLiteralsInSelectExpressionTest.java | 2 +- .../test/jpa}/query/ScalarResultNativeQueryTest.java | 2 +- .../test => orm/test/jpa}/query/TupleNativeQueryTest.java | 2 +- .../org/hibernate/test/annotations/query/NamedQueryTest.java | 4 ++-- 15 files changed, 20 insertions(+), 17 deletions(-) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/ConstructorResultNativeQueryTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/Contractor.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/DateTimeParameterTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/NamedQueryCommentTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/NamedQueryTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/NativeQueryOrdinalParametersTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/NativeQueryResultTypeAutoDiscoveryTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/NullParameterQueryTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/OracleConstructorResultNativeQueryTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/QueryParametersValidationTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/QueryTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/QueryWithLiteralsInSelectExpressionTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/ScalarResultNativeQueryTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/TupleNativeQueryTest.java (99%) diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java index 63d1766f91..79eacdc2bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java index a2e85f1731..3020dc6595 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Contractor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java @@ -4,11 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; +import org.hibernate.jpa.test.query.Employee; + /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java index 12268ce451..0b86aa5129 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/DateTimeParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.util.Date; import java.util.GregorianCalendar; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java index e973af6806..808411ad3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java index 620f4704d5..72831b5790 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.util.List; import jakarta.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java index 1ed961943c..ccd7b849ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.util.List; import jakarta.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java index 4f03c7b528..974dd8f150 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.math.BigDecimal; import java.sql.Blob; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java index b41487fa78..72fff0a306 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NullParameterQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java index 009272c7a0..90e96b1e7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/OracleConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.util.Date; import java.util.List; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java index d8d1598f3c..37ec1449a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryParametersValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.io.Serializable; import java.sql.PreparedStatement; @@ -114,7 +114,7 @@ public class QueryParametersValidationTest extends BaseEntityManagerFunctionalTe @GeneratedValue(strategy = GenerationType.AUTO) private Long id; - @Type(type = "org.hibernate.jpa.test.query.QueryParametersValidationTest$BooleanUserType") + @Type(type = "org.hibernate.orm.test.jpa.query.QueryParametersValidationTest$BooleanUserType") private boolean active; } diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java index 65ce4b96db..ed076a78be 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import java.util.ArrayList; import java.util.Arrays; @@ -35,6 +35,7 @@ import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.jpa.test.Distributor; import org.hibernate.jpa.test.Item; import org.hibernate.jpa.test.Wallet; +import org.hibernate.jpa.test.query.Employee; import org.hibernate.stat.Statistics; import org.hibernate.testing.SkipForDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java index 9a0a5c288d..dc8991c3c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/QueryWithLiteralsInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java index d92ce8f0d1..6518b012fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/ScalarResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java index b423348cfd..57cfe29ece 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/TupleNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java @@ -1,4 +1,4 @@ -package org.hibernate.jpa.test.query; +package org.hibernate.orm.test.jpa.query; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java index 0384924004..b27e369a59 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/NamedQueryTest.java @@ -33,7 +33,7 @@ public class NamedQueryTest extends BaseCoreFunctionalTestCase { @Override public Class[] getAnnotatedClasses() { - return new Class[] {org.hibernate.jpa.test.query.NamedQueryTest.Game.class}; + return new Class[] { org.hibernate.orm.test.jpa.query.NamedQueryTest.Game.class}; } @Before @@ -41,7 +41,7 @@ public class NamedQueryTest extends BaseCoreFunctionalTestCase { throws Exception { doInHibernate( this::sessionFactory, session -> { for ( String title : GAME_TITLES ) { - org.hibernate.jpa.test.query.NamedQueryTest.Game game = new org.hibernate.jpa.test.query.NamedQueryTest.Game( + org.hibernate.orm.test.jpa.query.NamedQueryTest.Game game = new org.hibernate.orm.test.jpa.query.NamedQueryTest.Game( title ); session.save( game ); }