From 12fb58f6b9df588bcf9ff5b465a23da002cb8481 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Fri, 19 Mar 2021 15:25:08 -0500 Subject: [PATCH] re-enable tests --- .../hql/internal/SemanticQueryBuilder.java | 39 ++++++--- .../SqlFunctionMissingTest.java | 85 ------------------- .../binding/mixed}/AnnotationEntity.java | 8 +- .../bootstrap/binding/mixed}/HBMEntity.java | 8 +- ...yToOneAnnotationMissingPrimaryKeyTest.java | 10 ++- .../mixed}/XMLMappingDisabledTest.java | 8 +- .../bootstrap/binding/mixed/package-info.java | 11 +++ .../ImplicitIndexColumnNameSourceTest.java | 9 +- .../binding}/naming/NamingHelperTest.java | 9 +- .../ClassLoaderServiceImplTest.java | 9 +- .../classloading}/IsolatedClassLoader.java | 2 +- .../registry/classloading}/MyService.java | 2 +- .../registry/classloading}/MyServiceImpl.java | 2 +- .../delegation/TestDelegatingMetadata.java | 2 +- ...tDelegatingMetadataBuilderImplementor.java | 2 +- ...TestDelegatingMetadataBuildingOptions.java | 2 +- .../TestDelegatingSessionFactoryBuilder.java | 2 +- ...atingSessionFactoryBuilderImplementor.java | 2 +- .../TestDelegatingSessionFactoryOptions.java | 2 +- ...unctionMetadataBuilderContributorTest.java | 8 +- ...nverterMetadataBuilderContributorTest.java | 2 +- ...SqlFunctionMetadataBuilderContributor.java | 2 +- ...tadataBuilderContributorClassNameTest.java | 2 +- ...onMetadataBuilderContributorClassTest.java | 10 +-- ...BuilderContributorIllegalArgumentTest.java | 3 +- ...erContributorIllegalClassArgumentTest.java | 2 +- ...etadataBuilderContributorInstanceTest.java | 2 +- ...t.registry.classloading.internal.MyService | 1 - ....bootstrap.registry.classloading.MyService | 1 + .../binding/mixed}/HBMEntity.hbm.xml | 8 +- 30 files changed, 109 insertions(+), 146 deletions(-) delete mode 100644 hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMissingTest.java rename hibernate-core/src/test/java/org/hibernate/{boot/model/source/internal/hbm => orm/test/bootstrap/binding/mixed}/AnnotationEntity.java (61%) rename hibernate-core/src/test/java/org/hibernate/{boot/model/source/internal/hbm => orm/test/bootstrap/binding/mixed}/HBMEntity.java (57%) rename hibernate-core/src/test/java/org/hibernate/{boot/model/source/internal/hbm => orm/test/bootstrap/binding/mixed}/HBMManyToOneAnnotationMissingPrimaryKeyTest.java (71%) rename hibernate-core/src/test/java/org/hibernate/{boot/model/source/internal/hbm => orm/test/bootstrap/binding/mixed}/XMLMappingDisabledTest.java (83%) create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java rename hibernate-core/src/test/java/org/hibernate/{boot/model => orm/test/bootstrap/binding}/naming/ImplicitIndexColumnNameSourceTest.java (64%) rename hibernate-core/src/test/java/org/hibernate/{boot/model => orm/test/bootstrap/binding}/naming/NamingHelperTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{boot/registry/classloading/internal => orm/test/bootstrap/registry/classloading}/ClassLoaderServiceImplTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{boot/registry/classloading/internal => orm/test/bootstrap/registry/classloading}/IsolatedClassLoader.java (97%) rename hibernate-core/src/test/java/org/hibernate/{boot/registry/classloading/internal => orm/test/bootstrap/registry/classloading}/MyService.java (83%) rename hibernate-core/src/test/java/org/hibernate/{boot/registry/classloading/internal => orm/test/bootstrap/registry/classloading}/MyServiceImpl.java (81%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/delegation/TestDelegatingMetadata.java (92%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/delegation/TestDelegatingMetadataBuilderImplementor.java (94%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/delegation/TestDelegatingMetadataBuildingOptions.java (93%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/delegation/TestDelegatingSessionFactoryBuilder.java (93%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java (94%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/delegation/TestDelegatingSessionFactoryOptions.java (92%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java (97%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java (90%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java (90%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java (72%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java (92%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{boot => orm/test/bootstrap}/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java (90%) delete mode 100644 hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.classloading.internal.MyService create mode 100644 hibernate-core/src/test/resources/META-INF/services/org.hibernate.orm.test.bootstrap.registry.classloading.MyService rename hibernate-core/src/test/resources/org/hibernate/{boot/model/source/internal/hbm => orm/test/bootstrap/binding/mixed}/HBMEntity.hbm.xml (61%) diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java index d6bd47cc2b..6f85a75bf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java @@ -2896,14 +2896,19 @@ public class SemanticQueryBuilder extends HqlParserBaseVisitor implem @Override public SqmExpression visitJpaNonStandardFunction(HqlParser.JpaNonStandardFunctionContext ctx) { final String functionName = ctx.jpaNonStandardFunctionName().STRING_LITERAL().getText().toLowerCase(); - List> functionArguments = - ctx.nonStandardFunctionArguments() == null ? emptyList() : - (List>) ctx.nonStandardFunctionArguments().accept( this ); + //noinspection unchecked + final List> functionArguments = ctx.nonStandardFunctionArguments() == null + ? emptyList() + : (List>) ctx.nonStandardFunctionArguments().accept( this ); SqmFunctionDescriptor functionTemplate = getFunctionDescriptor( functionName ); if (functionTemplate == null) { - functionTemplate = new NamedSqmFunctionDescriptor( functionName, true, null, - StandardFunctionReturnTypeResolvers.invariant( StandardBasicTypes.OBJECT_TYPE ) ); + functionTemplate = new NamedSqmFunctionDescriptor( + functionName, + true, + null, + StandardFunctionReturnTypeResolvers.invariant( StandardBasicTypes.OBJECT_TYPE ) + ); } return functionTemplate.generateSqmExpression( functionArguments, @@ -2918,21 +2923,29 @@ public class SemanticQueryBuilder extends HqlParserBaseVisitor implem if ( creationOptions.useStrictJpaCompliance() ) { throw new StrictJpaComplianceViolation( "Encountered non-compliant non-standard function call [" + - ctx.nonStandardFunctionName() + "], but strict JPQL compliance was requested; use JPA's FUNCTION(functionName[,...]) syntax name instead", + ctx.nonStandardFunctionName() + "], but strict JPA " + + "compliance was requested; use JPA's FUNCTION(functionName[,...]) " + + "syntax name instead", StrictJpaComplianceViolation.Type.FUNCTION_CALL ); } final String functionName = ctx.nonStandardFunctionName().getText().toLowerCase(); - List> functionArguments = - ctx.nonStandardFunctionArguments() == null ? emptyList() : - (List>) ctx.nonStandardFunctionArguments().accept( this ); + //noinspection unchecked + final List> functionArguments = ctx.nonStandardFunctionArguments() == null + ? emptyList() + : (List>) ctx.nonStandardFunctionArguments().accept( this ); - SqmFunctionDescriptor functionTemplate = getFunctionDescriptor(functionName); - if (functionTemplate == null) { - functionTemplate = new NamedSqmFunctionDescriptor( functionName, true, null, - StandardFunctionReturnTypeResolvers.invariant( StandardBasicTypes.OBJECT_TYPE ) ); + SqmFunctionDescriptor functionTemplate = getFunctionDescriptor( functionName ); + if ( functionTemplate == null ) { + functionTemplate = new NamedSqmFunctionDescriptor( + functionName, + true, + null, + StandardFunctionReturnTypeResolvers.invariant( StandardBasicTypes.OBJECT_TYPE ) + ); } + return functionTemplate.generateSqmExpression( functionArguments, null, diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMissingTest.java b/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMissingTest.java deleted file mode 100644 index b8697eec7b..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMissingTest.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * 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.boot.spi.metadatabuildercontributor; - -import javax.persistence.Entity; -import javax.persistence.Id; - -import org.hibernate.annotations.NaturalId; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; - -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.util.ExceptionUtil; -import org.junit.Test; - -import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -/** - * @author Vlad Mihalcea - */ -@RequiresDialect(H2Dialect.class) -@TestForIssue( jiraKey = "HHH-12589" ) -public class SqlFunctionMissingTest extends BaseEntityManagerFunctionalTestCase { - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { - Employee.class, - }; - } - - final Employee employee = new Employee(); - - @Override - protected void afterEntityManagerFactoryBuilt() { - doInJPA( this::entityManagerFactory, entityManager -> { - employee.id = 1L; - employee.username = "user@acme.com"; - - entityManager.persist( employee ); - } ); - } - - @Test - public void test() { - try { - doInJPA( this::entityManagerFactory, entityManager -> { - Number result = (Number) entityManager.createQuery( - "select INSTR(e.username,'@') " + - "from Employee e " + - "where " + - " e.id = :employeeId") - .setParameter( "employeeId", employee.id ) - .getSingleResult(); - - fail("Should throw exception!"); - } ); - } - catch (Exception expected) { - assertTrue( ExceptionUtil.rootCause( expected ).getMessage().contains( "No data type for node: org.hibernate.hql.internal.ast.tree.MethodNod" ) ); - } - } - - @Entity(name = "Employee") - public static class Employee { - - @Id - private Long id; - - @NaturalId - private String username; - - private String password; - } - -} diff --git a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/AnnotationEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java similarity index 61% rename from hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/AnnotationEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java index a675e87ead..1a8f8b50e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/AnnotationEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/AnnotationEntity.java @@ -1,4 +1,10 @@ -package org.hibernate.boot.model.source.internal.hbm; +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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.orm.test.bootstrap.binding.mixed; import javax.persistence.*; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/HBMEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java similarity index 57% rename from hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/HBMEntity.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java index 40546468cd..4eba013436 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/HBMEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.java @@ -1,4 +1,10 @@ -package org.hibernate.boot.model.source.internal.hbm; +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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.orm.test.bootstrap.binding.mixed; public class HBMEntity { diff --git a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/HBMManyToOneAnnotationMissingPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java similarity index 71% rename from hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/HBMManyToOneAnnotationMissingPrimaryKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java index d194e07f33..e516e102c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/HBMManyToOneAnnotationMissingPrimaryKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java @@ -1,4 +1,10 @@ -package org.hibernate.boot.model.source.internal.hbm; +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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.orm.test.bootstrap.binding.mixed; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Assert; @@ -27,7 +33,7 @@ public class HBMManyToOneAnnotationMissingPrimaryKeyTest extends BaseNonConfigCo @Override protected String getBaseForMappings() { - return "/org/hibernate/boot/model/source/internal/hbm/"; + return "/org/hibernate/orm/test/bootstrap/binding/mixed/"; } /** diff --git a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/XMLMappingDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java similarity index 83% rename from hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/XMLMappingDisabledTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java index 8cc2f84ada..72954bbdb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/model/source/internal/hbm/XMLMappingDisabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/XMLMappingDisabledTest.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * 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.boot.model.source.internal.hbm; +package org.hibernate.orm.test.bootstrap.binding.mixed; import java.util.Map; @@ -41,7 +41,7 @@ public class XMLMappingDisabledTest extends BaseNonConfigCoreFunctionalTestCase @Override protected String getBaseForMappings() { - return "/org/hibernate/boot/model/source/internal/hbm/"; + return "/org/hibernate/orm/test/bootstrap/binding/mixed/"; } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java new file mode 100644 index 0000000000..47d541bf13 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/package-info.java @@ -0,0 +1,11 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * 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 + */ + +/** + * Tests for verifying mixed use of HBM and annotations + */ +package org.hibernate.orm.test.bootstrap.binding.mixed; \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSourceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java similarity index 64% rename from hibernate-core/src/test/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSourceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java index 2b2c4f6ac4..54bb7d5e21 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSourceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/ImplicitIndexColumnNameSourceTest.java @@ -1,10 +1,13 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * 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.boot.model.naming; +package org.hibernate.orm.test.bootstrap.binding.naming; + +import org.hibernate.boot.model.naming.ImplicitIndexColumnNameSource; +import org.hibernate.boot.model.naming.ImplicitNameSource; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/model/naming/NamingHelperTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/boot/model/naming/NamingHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java index d31768c00f..ed541a8d88 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/model/naming/NamingHelperTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/naming/NamingHelperTest.java @@ -1,14 +1,17 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * 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.boot.model.naming; +package org.hibernate.orm.test.bootstrap.binding.naming; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.model.naming.NamingHelper; + import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; import org.hibernate.testing.util.ReflectionUtil; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImplTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImplTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java index 14dfa58064..379bb162d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImplTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/ClassLoaderServiceImplTest.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . + * 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.boot.registry.classloading.internal; +package org.hibernate.orm.test.bootstrap.registry.classloading; import java.net.URL; import java.util.ArrayList; @@ -12,6 +12,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl; +import org.hibernate.boot.registry.classloading.internal.TcclLookupPrecedence; + import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/IsolatedClassLoader.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/IsolatedClassLoader.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.java index a1a1a6d5c9..5a15e7ebfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/IsolatedClassLoader.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/IsolatedClassLoader.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.boot.registry.classloading.internal; +package org.hibernate.orm.test.bootstrap.registry.classloading; import java.io.IOException; import java.io.InputStream; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/MyService.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.java similarity index 83% rename from hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/MyService.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.java index ce0898803d..10218125d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/MyService.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyService.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.boot.registry.classloading.internal; +package org.hibernate.orm.test.bootstrap.registry.classloading; import org.hibernate.service.Service; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/MyServiceImpl.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.java similarity index 81% rename from hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/MyServiceImpl.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.java index fa9f185022..2594f0c9ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/registry/classloading/internal/MyServiceImpl.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/MyServiceImpl.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.boot.registry.classloading.internal; +package org.hibernate.orm.test.bootstrap.registry.classloading; public class MyServiceImpl implements MyService { } diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadata.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadata.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.java index 4a3288f102..ffb159d46d 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadata.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadata.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.boot.spi.delegation; +package org.hibernate.orm.test.bootstrap.spi.delegation; import org.hibernate.boot.spi.AbstractDelegatingMetadata; import org.hibernate.boot.spi.MetadataImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadataBuilderImplementor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.java index bca2fe1538..3cf5c5939a 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadataBuilderImplementor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuilderImplementor.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.boot.spi.delegation; +package org.hibernate.orm.test.bootstrap.spi.delegation; import org.hibernate.boot.spi.AbstractDelegatingMetadataBuilderImplementor; import org.hibernate.boot.spi.BootstrapContext; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadataBuildingOptions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadataBuildingOptions.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.java index 58cc81306f..50da4234c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingMetadataBuildingOptions.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingMetadataBuildingOptions.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.boot.spi.delegation; +package org.hibernate.orm.test.bootstrap.spi.delegation; import org.hibernate.boot.spi.AbstractDelegatingMetadataBuildingOptions; import org.hibernate.boot.spi.MetadataBuildingOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryBuilder.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryBuilder.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.java index 7c43bc26f4..1958ebdf46 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryBuilder.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilder.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.boot.spi.delegation; +package org.hibernate.orm.test.bootstrap.spi.delegation; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.boot.spi.AbstractDelegatingSessionFactoryBuilder; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java index 2182f2aa4d..b2c5290860 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryBuilderImplementor.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.boot.spi.delegation; +package org.hibernate.orm.test.bootstrap.spi.delegation; import org.hibernate.boot.spi.AbstractDelegatingSessionFactoryBuilderImplementor; import org.hibernate.boot.spi.SessionFactoryBuilderImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryOptions.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryOptions.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.java index d05b6d40ac..25b0c776a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/delegation/TestDelegatingSessionFactoryOptions.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/delegation/TestDelegatingSessionFactoryOptions.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.boot.spi.delegation; +package org.hibernate.orm.test.bootstrap.spi.delegation; import org.hibernate.boot.spi.AbstractDelegatingSessionFactoryOptions; import org.hibernate.boot.spi.SessionFactoryOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java index 1e1f468f70..4ab439bcbc 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import java.util.Map; import javax.persistence.Entity; @@ -61,15 +61,15 @@ public abstract class AbstractSqlFunctionMetadataBuilderContributorTest extends @Test public void test() { doInJPA( this::entityManagerFactory, entityManager -> { - String result = (String) entityManager.createQuery( + int result = entityManager.createQuery( "select INSTR(e.username,'@acme.com') " + "from Employee e " + "where " + - " e.id = :employeeId") + " e.id = :employeeId", Integer.class ) .setParameter( "employeeId", employee.id ) .getSingleResult(); - assertEquals( "5", result ); + assertEquals( 5, result ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java index e29ee1edcd..6a9f078fd1 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import java.time.YearMonth; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java index ba4cea8e62..eb6deab347 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributor.java @@ -1,4 +1,4 @@ -package org.hibernate.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.spi.MetadataBuilderContributor; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java index 228bf00fd4..02aaaf953d 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassNameTest.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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java similarity index 72% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java index 1ceac69669..302d8e3c51 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorClassTest.java @@ -4,20 +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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; -import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; - -import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; -import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java index 5aeaf44ba7..446d8e017e 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalArgumentTest.java @@ -4,11 +4,10 @@ * 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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java index 8c1c331119..e81175ceea 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorIllegalClassArgumentTest.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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java index 9bbe917152..ca47fa5b9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/boot/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/SqlFunctionMetadataBuilderContributorInstanceTest.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.boot.spi.metadatabuildercontributor; +package org.hibernate.orm.test.bootstrap.spi.metadatabuildercontributor; import org.hibernate.dialect.H2Dialect; diff --git a/hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.classloading.internal.MyService b/hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.classloading.internal.MyService deleted file mode 100644 index 89b4c390ee..0000000000 --- a/hibernate-core/src/test/resources/META-INF/services/org.hibernate.boot.registry.classloading.internal.MyService +++ /dev/null @@ -1 +0,0 @@ -org.hibernate.boot.registry.classloading.internal.MyServiceImpl \ No newline at end of file diff --git a/hibernate-core/src/test/resources/META-INF/services/org.hibernate.orm.test.bootstrap.registry.classloading.MyService b/hibernate-core/src/test/resources/META-INF/services/org.hibernate.orm.test.bootstrap.registry.classloading.MyService new file mode 100644 index 0000000000..51665be6ff --- /dev/null +++ b/hibernate-core/src/test/resources/META-INF/services/org.hibernate.orm.test.bootstrap.registry.classloading.MyService @@ -0,0 +1 @@ +org.hibernate.orm.test.bootstrap.registry.classloading.MyServiceImpl \ No newline at end of file diff --git a/hibernate-core/src/test/resources/org/hibernate/boot/model/source/internal/hbm/HBMEntity.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.hbm.xml similarity index 61% rename from hibernate-core/src/test/resources/org/hibernate/boot/model/source/internal/hbm/HBMEntity.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.hbm.xml index 4ae7137180..92fae6a5c2 100644 --- a/hibernate-core/src/test/resources/org/hibernate/boot/model/source/internal/hbm/HBMEntity.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/bootstrap/binding/mixed/HBMEntity.hbm.xml @@ -1,9 +1,15 @@ + - +