From 05f643f208456d5500e9df9c09421fe4c72f7683 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Wed, 29 Sep 2021 16:42:44 +0200 Subject: [PATCH] Move some more jpa.test subpackages to orm.test --- .../BidirectionalTwoOneToManyMapsIdTest.java | 2 +- .../CompositeIdAssociationTest.java | 2 +- ...vedIdentifierPrimaryKeyJoinColumnTest.java | 2 +- .../associations/DerivedIdentifierTest.java | 2 +- .../associations/JoinColumnOrFormulaTest.java | 4 +- .../associations/JoinFormulaTest.java | 4 +- .../ManyToManyBidirectionalTest.java | 2 +- ...ToManyBidirectionalWithLinkEntityTest.java | 4 +- .../ManyToManyUnidirectionalTest.java | 4 +- .../userguide/associations/ManyToOneTest.java | 2 +- .../userguide/associations/NotFoundTest.java | 2 +- .../OneToManyBidirectionalTest.java | 2 +- .../OneToManyUnidirectionalTest.java | 2 +- .../OneToOneBidirectionalLazyTest.java | 5 +- .../OneToOneBidirectionalTest.java | 4 +- .../associations/OneToOneMapsIdTest.java | 2 +- .../OneToOnePrimaryKeyJoinColumnTest.java | 2 +- .../OneToOneUnidirectionalTest.java | 2 +- .../UnidirectionalManyToManyRemoveTest.java | 4 +- .../hibernate/userguide/batch/BatchTest.java | 4 +- .../caching/FirstLevelCacheTest.java | 2 +- .../caching/NonStrictReadWriteCacheTest.java | 2 +- .../caching/SecondLevelCacheTest.java | 2 +- .../userguide/collections/ArrayTest.java | 2 +- .../BasicTypeElementCollectionTest.java | 4 +- ...cTypeOrderColumnElementCollectionTest.java | 4 +- .../BidirectionalBagOrphanRemovalTest.java | 2 +- .../collections/BidirectionalBagTest.java | 2 +- .../BidirectionalComparatorSortedSetTest.java | 4 +- .../collections/BidirectionalMapTest.java | 2 +- .../BidirectionalOrderByListTest.java | 2 +- .../BidirectionalOrderColumnListTest.java | 2 +- .../collections/BidirectionalSetTest.java | 2 +- .../BidirectionalSortedSetTest.java | 4 +- .../collections/ElementCollectionMapTest.java | 2 +- .../EmbeddableTypeElementCollectionTest.java | 2 +- .../collections/MapKeyClassTest.java | 2 +- .../userguide/collections/MapKeyTypeTest.java | 2 +- .../OrderColumnListIndexBaseTest.java | 2 +- .../collections/OrderedBySQLTest.java | 2 +- .../userguide/collections/QueueTest.java | 4 +- .../collections/UnidirectionalBagTest.java | 2 +- ...UnidirectionalComparatorSortedSetTest.java | 4 +- .../collections/UnidirectionalMapTest.java | 2 +- .../UnidirectionalOrderColumnListTest.java | 2 +- .../UnidirectionalOrderedByListTest.java | 2 +- .../collections/UnidirectionalSetTest.java | 2 +- .../UnidirectionalSortedSetTest.java | 4 +- .../userguide/criteria/CriteriaTest.java | 2 +- .../envers/CustomRevisionEntityTest.java | 5 +- .../userguide/envers/DefaultAuditTest.java | 2 +- ...ityTypeChangeAuditDefaultTrackingTest.java | 2 +- .../envers/EntityTypeChangeAuditTest.java | 2 +- ...angeAuditTrackingRevisionListenerTest.java | 2 +- .../envers/ModifiedFlagsAuditTest.java | 5 +- .../envers/QueryAuditAdressCountryTest.java | 2 +- .../userguide/envers/QueryAuditTest.java | 2 +- .../QueryAuditWithModifiedFlagTest.java | 2 +- .../envers/ValidityStrategyAuditTest.java | 2 +- .../events/DefaultEntityListenerTest.java | 2 +- .../userguide/events/InterceptorTest.java | 2 +- .../userguide/fetching/BatchFetchingTest.java | 5 +- .../fetching/DirectVsQueryFetchingTest.java | 4 +- .../userguide/fetching/FetchModeJoinTest.java | 4 +- .../fetching/FetchModeSelectTest.java | 4 +- .../fetching/FetchModeSubselectTest.java | 4 +- .../userguide/fetching/FetchingTest.java | 7 +- .../userguide/fetching/GraphFetchingTest.java | 5 +- .../fetching/LazyCollectionTest.java | 4 +- .../fetching/ProfileFetchingTest.java | 4 +- .../userguide/flush/AlwaysFlushTest.java | 4 +- .../userguide/flush/AutoFlushTest.java | 4 +- .../userguide/flush/CommitFlushTest.java | 4 +- .../userguide/flush/FlushOrderTest.java | 4 +- .../flush/HibernateAutoFlushTest.java | 3 - .../userguide/flush/ManualFlushTest.java | 4 +- .../org/hibernate/userguide/hql/HQLTest.java | 2 +- .../PostgreSQLFunctionSelectClauseTest.java | 2 +- .../PostgreSQLFunctionWhereClauseTest.java | 2 +- .../userguide/hql/SelectDistinctTest.java | 5 +- .../CollectionImmutabilityTest.java | 4 +- .../immutability/EntityImmutabilityTest.java | 4 +- .../DiscriminatorNotNullSingleTableTest.java | 2 +- ...iminatorOptionsNotNullSingleTableTest.java | 2 +- .../JoinTablePrimaryKeyJoinColumnTest.java | 2 +- .../userguide/inheritance/JoinTableTest.java | 2 +- .../inheritance/MappedSuperclassTest.java | 2 +- .../SingleTableDiscriminatorFormulaTest.java | 2 +- .../inheritance/SingleTableTest.java | 2 +- .../inheritance/TablePerClassTest.java | 2 +- .../ExplicitPolymorphismTest.java | 2 +- .../org/hibernate/userguide/jmx/JmxTest.java | 5 +- .../locking/ExplicitLockingTest.java | 4 +- .../userguide/locking/OptimisticLockTest.java | 2 +- .../locking/OptimisticLockTypeAllTest.java | 4 +- .../locking/OptimisticLockTypeDirtyTest.java | 4 +- .../locking/OptimisticLockingInstantTest.java | 3 +- .../locking/OptimisticLockingTest.java | 2 +- .../OptimisticLockingTimestampTest.java | 2 +- .../userguide/locking/VersionSourceTest.java | 2 +- .../access/ElementCollectionAccessTest.java | 2 +- .../mapping/access/EmbeddableAccessTest.java | 2 +- .../mapping/access/FieldAccessTest.java | 4 +- .../access/PropertyAccessOverrideTest.java | 2 +- .../mapping/access/PropertyAccessTest.java | 2 +- .../mapping/basic/AutoQuotingTest.java | 2 +- .../mapping/basic/BlobByteArrayTest.java | 2 +- .../userguide/mapping/basic/BlobTest.java | 2 +- .../CalendarWithTemporalTimestampTest.java | 3 +- .../mapping/basic/ClobStringTest.java | 2 +- .../userguide/mapping/basic/ClobTest.java | 2 +- .../mapping/basic/ColumnTransformerTest.java | 2 +- .../basic/DateWithTemporalDateTest.java | 2 +- .../basic/DateWithTemporalTimeTest.java | 2 +- .../basic/DateWithTemporalTimestampTest.java | 2 +- .../basic/EnumerationConverterTest.java | 2 +- .../basic/EnumerationCustomTypeTest.java | 2 +- .../mapping/basic/ExplicitBasicTypeTest.java | 2 +- .../basic/ExplicitColumnNamingTest.java | 2 +- .../mapping/basic/ExplicitTypeTest.java | 2 +- .../userguide/mapping/basic/FormulaTest.java | 2 +- .../mapping/basic/ImplicitBasicTypeTest.java | 2 +- .../mapping/basic/InstantLiteralTest.java | 2 +- .../mapping/basic/JpaQuotingTest.java | 2 +- .../LocalDateTimeWithTemporalTimeTest.java | 2 +- .../mapping/basic/NClobCharArrayTest.java | 2 +- .../mapping/basic/NClobStringTest.java | 4 +- .../mapping/basic/NationalizedTest.java | 2 +- .../userguide/mapping/basic/ParentTest.java | 2 +- .../basic/PhoneTypeEnumeratedOrdinalTest.java | 2 +- .../basic/PhoneTypeEnumeratedStringTest.java | 2 +- .../userguide/mapping/basic/QuotingTest.java | 2 +- .../userguide/mapping/basic/TargetTest.java | 2 +- .../mapping/basic/TypeCategoryTest.java | 2 +- .../mapping/converter/MoneyConverterTest.java | 2 +- .../mapping/converter/PeriodStringTest.java | 2 +- .../converter/hbm/MoneyConverterHbmTest.java | 2 +- .../mapping/dynamic/DynamicEntityTest.java | 3 +- .../embeddable/EmbeddableOverrideTest.java | 2 +- .../embeddable/NestedEmbeddableTest.java | 2 +- .../mapping/embeddable/ParentTest.java | 2 +- .../SimpleEmbeddableEquivalentTest.java | 2 +- .../embeddable/SimpleEmbeddableTest.java | 2 +- .../mapping/embeddable/TargetTest.java | 2 +- .../generated/CreationTimestampTest.java | 2 +- .../DatabaseValueGenerationTest.java | 2 +- .../mapping/generated/GeneratedTest.java | 2 +- .../mapping/generated/GeneratorTypeTest.java | 2 +- .../InMemoryValueGenerationTest.java | 2 +- .../generated/UpdateTimestampTest.java | 2 +- .../identifier/AssignedIdentifierTest.java | 2 +- .../userguide/mapping/identifier/Book.java | 2 - .../identifier/CacheableNaturalIdTest.java | 2 +- .../identifier/CompositeNaturalIdTest.java | 2 +- .../identifier/EmbeddedIdManyToOneTest.java | 2 +- .../mapping/identifier/EmbeddedIdTest.java | 2 +- .../identifier/EntityTableCatalogTest.java | 4 +- .../identifier/EntityTableSchemaTest.java | 3 +- .../identifier/GeneratedIdentifierTest.java | 2 +- .../identifier/IdClassGeneratedValueTest.java | 3 +- .../identifier/IdClassManyToOneTest.java | 2 +- .../mapping/identifier/IdClassTest.java | 2 +- .../mapping/identifier/IdManyToOneTest.java | 3 +- .../identifier/MultipleNaturalIdTest.java | 2 +- .../identifier/MutableNaturalIdTest.java | 2 +- .../NaiveEqualsHashCodeEntityTest.java | 2 +- .../NaturalIdEqualsHashCodeEntityTest.java | 2 +- .../identifier/PooledOptimizerTest.java | 2 +- .../mapping/identifier/RowIdTest.java | 3 +- .../SequenceGeneratorConfiguredTest.java | 2 +- .../SequenceGeneratorNamedTest.java | 4 +- .../SequenceGeneratorUnnamedTest.java | 2 +- .../identifier/SimpleEntityTableTest.java | 2 +- .../mapping/identifier/SimpleEntityTest.java | 3 +- .../identifier/SimpleNaturalIdTest.java | 2 +- .../TableGeneratorConfiguredTest.java | 2 +- .../identifier/TableGeneratorUnnamedTest.java | 4 +- .../UuidCustomGeneratedValueTest.java | 2 +- .../identifier/UuidGeneratedValueTest.java | 2 +- .../EmbeddedIdDatabaseGeneratedValueTest.java | 2 +- .../EmbeddedIdInMemoryGeneratedValueTest.java | 2 +- .../userguide/pc/BytecodeEnhancementTest.java | 2 +- .../userguide/pc/CascadeDetachTest.java | 2 +- .../userguide/pc/CascadeLockTest.java | 2 +- .../userguide/pc/CascadeMergeTest.java | 2 +- .../pc/CascadeOnDeleteCollectionTest.java | 2 +- .../userguide/pc/CascadeOnDeleteTest.java | 2 +- .../userguide/pc/CascadePersistTest.java | 2 +- .../userguide/pc/CascadeRefreshTest.java | 2 +- .../userguide/pc/CascadeRemoveTest.java | 2 +- .../userguide/pc/CascadeReplicateTest.java | 2 +- .../userguide/pc/DynamicUpdateTest.java | 2 +- .../userguide/pc/FilterJoinTableTest.java | 2 +- .../pc/FilterSqlFragementAliasTest.java | 6 +- .../hibernate/userguide/pc/FilterTest.java | 2 +- .../userguide/pc/MultiLoadIdTest.java | 3 +- .../userguide/pc/NoDynamicUpdateTest.java | 3 +- .../userguide/pc/PersistenceContextTest.java | 4 +- .../userguide/pc/WhereJoinTableTest.java | 2 +- .../org/hibernate/userguide/pc/WhereTest.java | 2 +- .../hibernate/userguide/schema/CheckTest.java | 2 +- .../userguide/schema/ColumnDefaultTest.java | 2 +- .../hibernate/userguide/schema/IndexTest.java | 4 +- .../schema/SchemaGenerationTest.java | 2 +- .../schema/UniqueConstraintTest.java | 4 +- .../userguide/sql/CollectionLoaderTest.java | 4 +- .../sql/CustomSQLSecondaryTableTest.java | 4 +- .../userguide/sql/CustomSQLTest.java | 4 +- .../sql/MySQLStoredProcedureTest.java | 2 +- ...racleCustomSQLWithStoredProcedureTest.java | 4 +- .../sql/OracleStoredProcedureTest.java | 2 +- .../org/hibernate/userguide/sql/SQLTest.java | 4 +- .../transactions/TransactionsTest.java | 2 +- .../dialect/InformixDialectTestCase.java | 2 +- .../cfgxmlpar/META-INF/persistence.xml | 2 +- .../jpa}/pack/cfgxmlpar/hibernate.cfg.xml | 12 +- .../templates/defaultpar/META-INF/orm.xml | 4 +- .../defaultpar/META-INF/persistence.xml | 2 +- .../test/jpa}/pack/defaultpar/Mouse.hbm.xml | 2 +- .../templates/defaultpar_1_0/META-INF/orm.xml | 8 +- .../defaultpar_1_0/META-INF/persistence.xml | 2 +- .../jpa}/pack/defaultpar_1_0/Mouse1.hbm.xml | 2 +- .../jpa}/pack/excludehbmpar/Mouse.hbm.xml | 2 +- .../templates/explicitpar/META-INF/orm.xml | 2 +- .../explicitpar/META-INF/persistence.xml | 16 +-- .../templates/explicitpar2/META-INF/orm.xml | 2 +- .../explicitpar2/META-INF/persistence.xml | 16 +-- .../jpa}/pack/explodedpar/Elephant.hbm.xml | 2 +- .../templates/externaljar/META-INF/orm.xml | 2 +- .../war/WEB-INF/classes/META-INF/orm.xml | 4 +- .../WEB-INF/classes/META-INF/persistence.xml | 2 +- .../test/jpa}/pack/war/Mouse.hbm.xml | 2 +- .../test/mapping/NestedEmbeddableTest.java | 2 +- .../jpa/test/mapping/QuotingTest.java | 2 +- .../AbstractJpaMetamodelPopulationTest.java | 2 +- .../AbstractMetamodelSpecificTest.java | 2 +- .../jpa/test/metamodel/EmbeddedTypeTest.java | 2 +- .../annotations/CreationTimestampTest.java | 2 +- ...ryCreationTimestampNullableColumnTest.java | 2 +- .../InMemoryUpdateTimestampTest.java | 3 +- .../UpdateTimeStampInheritanceTest.java | 2 +- .../test/annotations/UpdateTimestampTest.java | 2 +- .../JoinFormulaManyToOneLazyFetchingTest.java | 2 +- ...ulaManyToOneNotIgnoreLazyFetchingTest.java | 4 +- ...ulaOneToManyNotIgnoreLazyFetchingTest.java | 4 +- ...mulaOneToOneNotIgnoreLazyFetchingTest.java | 2 +- .../loader/LoaderWithInvalidQueryTest.java | 3 +- .../ManyToOneMapsIdFlushModeTest.java | 2 +- .../SecondaryTableSchemaTest.java | 2 +- ...oaderInitializationWithNoLockModeTest.java | 2 +- .../bootstrap/scanning/JarVisitorTest.java | 16 +-- .../scanning/PackagedEntityManagerTest.java | 45 ++++---- .../bootstrap/scanning/PackagingTestCase.java | 102 ++++++++--------- .../test/bootstrap/scanning/ScannerTest.java | 4 +- ...unctionMetadataBuilderContributorTest.java | 2 +- ...nverterMetadataBuilderContributorTest.java | 2 +- ...OneToManyWithEqualsImplementationTest.java | 2 +- .../LoadUninitializedCollectionTest.java | 2 +- ...QueryExecutionWithFlushModeAlwaysTest.java | 2 +- .../legacy/ConversionAutoApplyTest.java | 2 +- .../test/cdi/converters/legacy/QueryTest.java | 2 +- .../orm/test/comments/UseSqlCommentTest.java | 2 +- .../proxy/ComponentBasicProxyTest.java | 2 +- .../BeforeCompletionReleaseTest.java | 2 +- .../test/dialect/DB2390DialectTestCase.java | 4 +- .../function/HSQLTruncFunctionTest.java | 2 +- .../SQLServerDialectPaginationTest.java | 2 +- .../SequenceInformationMariaDBTest.java | 2 +- .../functional/SequenceInformationTest.java | 2 +- .../mappedbyid/LoadGraphFindByIdTest.java | 2 +- .../parser/AbstractEntityGraphTest.java | 2 +- ...nSessionFindJdbcExceptionHandlingTest.java | 2 +- ...rvingFiltersOutsideInitialSessionTest.java | 2 +- .../test/graph/AbstractEntityGraphTest.java | 2 +- .../{ => orm}/test/hql/CoalesceTest.java | 24 ++-- .../test/id/IdClassManyToOneCascadeTest.java | 2 +- ...GeneratorStringUniqueIdentifierIdTest.java | 2 +- .../IdentityInsertSoleColumnTest.java | 2 +- .../sqm/HqlTranslationNoFactoryTests.java | 2 +- .../BaseEntityManagerFunctionalTestCase.java | 2 +- .../{jpa/test => orm/test/jpa}/Cat.java | 2 +- .../test => orm/test/jpa}/Distributor.java | 2 +- .../orm/test/jpa/EntityManagerClosedTest.java | 2 - .../jpa}/EntityManagerFactoryClosedTest.java | 2 +- .../test/jpa}/EntityManagerTest.java | 2 +- .../{jpa/test => orm/test/jpa}/Item.java | 2 +- .../{ => orm/test}/jpa/JpaComplianceStub.java | 2 +- .../{jpa/test => orm/test/jpa}/Kitten.java | 2 +- .../test/jpa}/LastUpdateListener.java | 2 +- .../test/jpa}/MyNamingStrategy.java | 2 +- .../NamedQueryTransactionFailureTest.java | 2 +- .../test => orm/test/jpa}/NoOpListener.java | 2 +- .../test/jpa}/NotSerializableClass.java | 2 +- .../test/jpa}/SettingsGenerator.java | 2 +- .../test => orm/test/jpa}/TestHelper.java | 3 +- .../TestingEntityManagerFactoryGenerator.java | 2 +- .../{jpa/test => orm/test/jpa}/Wallet.java | 2 +- .../jpa/callbacks/CallbackAndDirtyTest.java | 2 +- .../jpa/callbacks/CallbacksDisabledTest.java | 4 +- .../orm/test/jpa/callbacks/CallbacksTest.java | 4 +- .../PreUpdateBytecodeEnhancementTest.java | 3 +- .../connection/DataSourceInjectionTest.java | 4 +- .../jpa/criteria/CriteriaCompilingTest.java | 2 +- .../CriteriaQueryTypeQueryAdapterTest.java | 3 +- .../EntitySuperclassCollectionTest.java | 2 +- .../orm/test/jpa/criteria/ParameterTest.java | 2 +- .../test/jpa/criteria/QueryBuilderTest.java | 2 +- .../criteria/SuperclassCollectionTest.java | 2 +- .../orm/test/jpa/criteria/TreatJoinTest.java | 2 +- .../test/jpa/criteria/TreatKeywordTest.java | 2 +- .../test/jpa/criteria/TreatListJoinTest.java | 2 +- .../alias/CriteriaMultiselectAliasTest.java | 2 +- .../basic/BasicCriteriaUsageTest.java | 2 +- .../test/jpa/criteria/basic/ConcatTest.java | 2 +- .../enumcollection/EnumIsMemberTest.java | 2 +- .../CriteriaToScrollableResultsFetchTest.java | 2 +- ...stractCriteriaLiteralHandlingModeTest.java | 3 +- .../criteria/mapjoin/MapJoinEntryTest.java | 2 +- .../mapjoin/MapJoinTestWithEmbeddable.java | 2 +- ...CriteriaLiteralInSelectExpressionTest.java | 2 +- .../nulliteral/CriteriaLiteralsTest.java | 3 +- .../nulliteral/NullLiteralExpression.java | 2 +- .../criteria/query/LimitExpressionTest.java | 2 +- .../selectcase/GroupBySelectCaseTest.java | 2 +- .../SelectCaseLiteralHandlingBindTest.java | 2 +- .../criteria/selectcase/SelectCaseTest.java | 2 +- .../simplecase/BasicSimpleCaseTest.java | 2 +- .../AbstractSubqueryInSelectClauseTest.java | 2 +- ...eDiscardPersistenceContextOnCloseTest.java | 2 +- ...eDiscardPersistenceContextOnCloseTest.java | 2 +- ...EntityManagerFactorySerializationTest.java | 10 +- .../EntityManagerSerializationTest.java | 11 +- .../ejb3configuration/InterceptorTest.java | 6 +- .../NamingStrategyConfigurationTest.java | 2 +- ...SerializableClassSettingValueProvider.java | 2 +- .../PersisterClassProviderTest.java | 2 +- .../TestLazyPropertyOnPreUpdate.java | 2 +- .../EntityGraphAttributeResolutionTest.java | 2 +- .../orm/test/jpa/graphs/EntityGraphTest.java | 2 +- .../jpa/graphs/LoadAndFetchGraphTest.java | 2 +- .../mappedbyid/FetchGraphFindByIdTest.java | 2 +- .../queryhint/QueryHintEntityGraphTest.java | 2 +- .../jpa}/joinable/ManyToOneJoinTableTest.java | 2 +- .../hibernate/orm/test/jpa/lock/LockTest.java | 3 +- .../jpa/lock/LockTimeoutPropertyTest.java | 2 +- .../jpa/lock/NativeSQLQueryTimeoutTest.java | 2 +- .../orm/test/jpa/lock/QueryLockingTest.java | 2 +- ...tementIsClosedAfterALockExceptionTest.java | 2 +- .../MappedSuperclassWithAttributesTest.java | 2 +- .../MappedSuperclassWithEmbeddedTest.java | 4 +- ...edSuperclassWithEntityWithIdClassTest.java | 2 +- ...SuperclassWithOverriddenAttributeTest.java | 2 +- .../test/jpa/ops/MergeJpaComplianceTest.java | 2 +- .../DeleteMultiLevelOrphansTest.java | 2 +- .../test/jpa}/pack/cfgxmlpar/Morito.java | 2 +- .../pack/defaultpar/ApplicationServer.java | 2 +- .../pack/defaultpar/IncrementListener.java | 2 +- .../test/jpa}/pack/defaultpar/Lighter.java | 2 +- .../test/jpa}/pack/defaultpar/Money.java | 2 +- .../test/jpa}/pack/defaultpar/Mouse.java | 2 +- .../defaultpar/OtherIncrementListener.java | 2 +- .../test/jpa}/pack/defaultpar/Version.java | 2 +- .../jpa}/pack/defaultpar/package-info.java | 2 +- .../defaultpar_1_0/ApplicationServer1.java | 2 +- .../defaultpar_1_0/IncrementListener1.java | 2 +- .../jpa}/pack/defaultpar_1_0/Lighter1.java | 2 +- .../test/jpa}/pack/defaultpar_1_0/Money1.java | 2 +- .../test/jpa}/pack/defaultpar_1_0/Mouse1.java | 2 +- .../OtherIncrementListener1.java | 2 +- .../jpa}/pack/defaultpar_1_0/Version1.java | 2 +- .../pack/defaultpar_1_0/package-info.java | 2 +- .../jpa}/pack/excludehbmpar/Caipirinha.java | 2 +- .../test/jpa}/pack/explicitpar/Washer.java | 2 +- .../test/jpa}/pack/explodedpar/Carpet.java | 2 +- .../test/jpa}/pack/explodedpar/Elephant.java | 2 +- .../jpa}/pack/explodedpar/package-info.java | 2 +- .../test/jpa}/pack/externaljar/Scooter.java | 2 +- .../test/jpa/pack/overridenpar}/Bug.java | 2 +- .../test/jpa/pack/spacepar}/Bug.java | 2 +- .../test/jpa}/pack/various/Airplane.java | 2 +- .../test/jpa}/pack/various/Seat.java | 2 +- .../test/jpa}/pack/war/ApplicationServer.java | 2 +- .../test/jpa}/pack/war/IncrementListener.java | 2 +- .../test/jpa}/pack/war/Lighter.java | 2 +- .../test => orm/test/jpa}/pack/war/Money.java | 2 +- .../test => orm/test/jpa}/pack/war/Mouse.java | 2 +- .../jpa}/pack/war/OtherIncrementListener.java | 2 +- .../test/jpa}/pack/war/Version.java | 2 +- .../test/jpa}/pack/war/package-info.java | 2 +- .../test/jpa}/persistenceunit/DataPoint.java | 2 +- .../DuplicatePersistenceUnitNameTest.java | 2 +- .../ExcludeUnlistedClassesTest.java | 2 +- ...TwoPersistenceUnits2LCDisabledEnabled.java | 4 +- .../persistenceunit/UnlistedDataPoint.java | 2 +- .../test/jpa}/query/CachedQueryTest.java | 7 +- .../ConstructorResultNativeQueryTest.java | 2 +- .../orm/test/jpa/query/Contractor.java | 2 - .../test/jpa/query/DateTimeParameterTest.java | 2 +- .../test => orm/test/jpa}/query/Employee.java | 2 +- .../test/jpa/query/LimitExpressionTest.java | 2 +- .../test/jpa/query/NamedQueryCommentTest.java | 2 +- .../orm/test/jpa/query/NamedQueryTest.java | 2 +- .../NativeQueryOrdinalParametersTest.java | 3 +- ...ativeQueryResultTypeAutoDiscoveryTest.java | 103 ++++++++++++++---- .../jpa/query/NullParameterQueryTest.java | 2 +- ...racleConstructorResultNativeQueryTest.java | 2 +- .../query/QueryParametersValidationTest.java | 2 +- .../orm/test/jpa/query/QueryTest.java | 49 +++------ ...eryWithLiteralsInSelectExpressionTest.java | 2 +- .../query/ScalarResultNativeQueryTest.java | 2 +- .../test/jpa/query/TupleNativeQueryTest.java | 2 +- ...DropUtf8WithoutHbm2DdlCharsetNameTest.java | 2 +- ...maGeneratorWithHbm2DdlCharsetNameTest.java | 5 +- ...maGeneratorWithHbm2DdlCharsetNameTest.java | 5 +- ...eneratorWithoutHbm2DdlCharsetNameTest.java | 5 +- ...aCreateDropWithHbm2DdlCharsetNameTest.java | 2 +- ...AbstractNonOptionalSecondaryTableTest.java | 2 +- .../spi/NativeQueryTupleTransformerTest.java | 4 +- .../components/ComponentCriteriaTest.java | 2 +- .../transaction/FlushAndTransactionTest.java | 2 +- .../TransactionCommitFailureTest.java | 2 +- .../jpa/userguide/util/GetIdentifierTest.java | 2 +- .../test/jpa/userguide/util/IsLoadedTest.java | 2 +- .../jpa/userguide/util/ProviderUtilTest.java | 2 +- .../jpa/xml/versions/JpaXsdVersionsTest.java | 4 +- .../converted/converter/ConverterTest.java | 2 +- .../test/pagination/OraclePaginationTest.java | 2 +- .../orm/test/query/AddNamedQueryTest.java | 6 +- .../CriteriaStringInlineLiteralTest.java | 2 +- .../internal/hhh11877/HHH111877Test.java | 2 +- .../internal/hhh13058/HHH13058Test.java | 2 +- .../internal/hhh13908/HHH13908Test.java | 2 +- .../internal/hhh14197/HHH14197Test.java | 2 +- .../AbstractSkipAutoCommitTest.java | 2 +- .../SchemaMigratorHaltOnErrorTest.java | 2 +- .../SchemaUpdateProceedOnErrorTest.java | 2 +- .../test/sql/function/JpaFunctionTest.java | 2 +- .../contributor/ArrayTypeContributorTest.java | 2 +- .../contributor/ArrayTypePropertiesTest.java | 2 +- ...rectionalOneToManyNonPkJoinColumnTest.java | 5 +- ...appingMappedSuperclassWithVersionTest.java | 2 +- .../InClauseParameterPaddingCriteriaTest.java | 2 +- .../query/InClauseParameterPaddingTest.java | 2 +- ...esentationLiteralParsingExceptionTest.java | 2 +- .../MaxInExpressionParameterPaddingTest.java | 2 +- .../query/NativeQueryWithParenthesesTest.java | 2 +- .../QueryPlanCacheStatisticsTest.java | 2 +- .../annotations/query/QueryAndSQLTest.java | 18 +-- .../UniqueConstraintBatchingTest.java | 2 +- .../test/hql/ASTParserLoadingTest.java | 1 - ...SubqueryReferencingTargetPropertyTest.java | 2 +- .../hibernate/test/hql/JoinOnClauseTest.java | 4 +- .../test/hql/SelectNewEmbeddedIdTest.java | 2 +- .../UpdateJoinedSubclassCorrelationTest.java | 2 +- .../hql/size/WhereClauseOrderBySizeTest.java | 2 +- ...eSQLMultipleTypesOtherContributorTest.java | 5 +- ...stgreSQLInetTypesOtherContributorTest.java | 3 - .../inet/PostgreSQLInetTypesOtherTest.java | 3 +- .../MappedSuperclassInheritanceTest.java | 2 +- .../SingleTableUpdateQueryTest.java | 2 +- .../JoinFetchWithEnhancementTest.java | 2 +- .../test/jpa/EntityManagerUnwrapTest.java | 2 +- .../JdbcTypeDescriptorConverterTest.java | 2 +- ...oOneEagerNonOptionalOrphanRemovalTest.java | 2 +- .../OneToOneEagerOrphanRemovalTest.java | 2 +- ...ToOneLazyNonOptionalOrphanRemovalTest.java | 2 +- .../OneToOneLazyOrphanRemovalTest.java | 2 +- ...LazyOrphanRemovalInEmbeddedEntityTest.java | 2 +- .../NestedIdClassDerivedIdentifiersTest.java | 2 +- .../mapping/hhh14343/NestedIdClassTest.java | 2 +- .../procedure/HANAStoredProcedureTest.java | 2 +- .../procedure/MySQLStoredProcedureTest.java | 2 +- .../procedure/OracleStoredProcedureTest.java | 6 +- .../PostgreSQLStoredProcedureTest.java | 2 +- ...erverStoredProcedureCrossDatabaseTest.java | 11 +- ...LServerStoredProcedureCrossSchemaTest.java | 3 +- .../SQLServerStoredProcedureTest.java | 6 +- .../test/replicate/ReplicateTest.java | 2 +- .../test/stats/QueryStatsMaxSizeTest.java | 12 +- .../type/LongListTypeContributorTest.java | 2 +- .../type/SmallIntToShortClassMappingTest.java | 2 +- .../org/hibernate/jpa/test/hibernate.cfg.xml | 12 +- .../persistenceunit/META-INF/persistence.xml | 8 +- .../persistenceUnitForNameDuplicationTest.xml | 4 +- .../iso8859/create-script-source.sql | 0 .../iso8859/create-script-source2.sql | 0 .../schemagen/iso8859/drop-script-source.sql | 0 .../schemagen/iso8859/drop-script-source2.sql | 0 .../schemagen/iso8859/load-script-source.sql | 0 .../schemagen/iso8859/load-script-source2.sql | 0 .../test/jpa/xml/versions/invalid-orm-1_0.xml | 6 +- .../test/jpa/xml/versions/valid-orm-1_0.xml | 8 +- .../test/jpa/xml/versions/valid-orm-2_0.xml | 4 +- .../test/jpa/xml/versions/valid-orm-2_1.xml | 4 +- .../test/jpa/xml/versions/valid-orm-2_2.xml | 4 +- 495 files changed, 734 insertions(+), 903 deletions(-) rename hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/{jpa/test => orm/test/jpa}/pack/cfgxmlpar/hibernate.cfg.xml (79%) rename hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/Mouse.hbm.xml (91%) rename hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/Mouse1.hbm.xml (90%) rename hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/{jpa/test => orm/test/jpa}/pack/excludehbmpar/Mouse.hbm.xml (90%) rename hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/{jpa/test => orm/test/jpa}/pack/explodedpar/Elephant.hbm.xml (88%) rename hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/Mouse.hbm.xml (90%) rename hibernate-core/src/test/java/org/hibernate/{ => orm}/test/hql/CoalesceTest.java (78%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/BaseEntityManagerFunctionalTestCase.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/Cat.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/Distributor.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/EntityManagerFactoryClosedTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/EntityManagerTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/Item.java (98%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/JpaComplianceStub.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/Kitten.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/LastUpdateListener.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/MyNamingStrategy.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/NamedQueryTransactionFailureTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/NoOpListener.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/NotSerializableClass.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/SettingsGenerator.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/TestHelper.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/TestingEntityManagerFactoryGenerator.java (97%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/Wallet.java (96%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/joinable/ManyToOneJoinTableTest.java (99%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/cfgxmlpar/Morito.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/ApplicationServer.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/IncrementListener.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/Lighter.java (87%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/Money.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/Mouse.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/OtherIncrementListener.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/Version.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar/package-info.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/ApplicationServer1.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/IncrementListener1.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/Lighter1.java (86%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/Money1.java (90%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/Mouse1.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/OtherIncrementListener1.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/Version1.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/defaultpar_1_0/package-info.java (86%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/excludehbmpar/Caipirinha.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/explicitpar/Washer.java (87%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/explodedpar/Carpet.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/explodedpar/Elephant.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/explodedpar/package-info.java (86%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/externaljar/Scooter.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test/pack/spacepar => orm/test/jpa/pack/overridenpar}/Bug.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test/pack/overridenpar => orm/test/jpa/pack/spacepar}/Bug.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/various/Airplane.java (90%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/various/Seat.java (90%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/ApplicationServer.java (94%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/IncrementListener.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/Lighter.java (88%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/Money.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/Mouse.java (93%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/OtherIncrementListener.java (92%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/Version.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/pack/war/package-info.java (88%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/persistenceunit/DataPoint.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/persistenceunit/DuplicatePersistenceUnitNameTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/persistenceunit/ExcludeUnlistedClassesTest.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/persistenceunit/UnlistedDataPoint.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/CachedQueryTest.java (95%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/query/Employee.java (98%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java (91%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java (87%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java (85%) rename hibernate-core/src/test/java/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java (94%) rename hibernate-core/src/test/java/org/hibernate/{ => orm/test}/jpa/spi/NativeQueryTupleTransformerTest.java (91%) rename hibernate-core/src/test/resources/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/create-script-source.sql (100%) rename hibernate-core/src/test/resources/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/create-script-source2.sql (100%) rename hibernate-core/src/test/resources/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/drop-script-source.sql (100%) rename hibernate-core/src/test/resources/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/drop-script-source2.sql (100%) rename hibernate-core/src/test/resources/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/load-script-source.sql (100%) rename hibernate-core/src/test/resources/org/hibernate/{jpa/test => orm/test/jpa}/schemagen/iso8859/load-script-source2.sql (100%) diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java index fbcbe4c88a..9a071c66bc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.MapsId; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java index c9498ce021..2b556bac07 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java index 536278db32..8ffbcfd794 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java index 71a29a8f91..32e895e473 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MapsId; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java index 3eafc82bf3..545ce152ca 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java @@ -17,12 +17,10 @@ import jakarta.persistence.Table; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java index 93eed47604..4986a28224 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java @@ -14,13 +14,11 @@ import jakarta.persistence.Table; import org.hibernate.annotations.JoinFormula; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java index 464bbc5c92..0da7d4aa98 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java index 63128f0b6c..d55744d809 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java @@ -19,12 +19,10 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java index c8c71d374b..6c0c01bb2b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java @@ -15,12 +15,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java index 51ae543c39..85970e535b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java index ec20e51e57..e29b9284c9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java index a4bca59571..ace7b29d59 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java index d59d2d4f0e..15ddfa7962 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java index 9e33a15c4d..5f6dd5db94 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java @@ -17,13 +17,10 @@ import jakarta.persistence.OneToOne; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.junit.Assert; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java index 1004fd6564..d3a75c993a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java @@ -15,13 +15,11 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java index ac2a4195af..b53f031b19 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.MapsId; import jakarta.persistence.OneToOne; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java index 859c4fb928..d7e9f4be83 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.OneToOne; import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java index 8b774b0966..ea5906ceea 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java index 54068aeedc..46de917baa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java @@ -15,12 +15,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.ManyToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java b/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java index 0bec711325..944ef5e72d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java @@ -16,7 +16,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.StatelessSession; import org.hibernate.Transaction; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.resource.transaction.spi.TransactionStatus; import org.hibernate.userguide.model.Call; import org.hibernate.userguide.model.Partner; @@ -25,8 +25,6 @@ import org.hibernate.userguide.model.Phone; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java index c04cb2255a..9717196219 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java index 48e5f73ca7..1796f6f776 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java @@ -12,7 +12,7 @@ import java.util.Map; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java index 1fc5d1d9e9..f345f834cb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.NaturalId; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.CacheRegionStatistics; import org.hibernate.stat.Statistics; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java index 7e6334aaf1..f13e3cd921 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.collections; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java index 7b83b5dd78..d8ad8b551f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java @@ -12,12 +12,10 @@ import jakarta.persistence.ElementCollection; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java index 50c336ce4f..2561085e7c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java @@ -13,12 +13,10 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.OrderColumn; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java index 19a11ecec3..ac872a074f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java index 2b349977e2..f71471ea86 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java index d811817d85..c1cf97b97a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java @@ -20,13 +20,11 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortComparator; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java index 2c58c2116d..a12199947b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.MapKey; import jakarta.persistence.MapKeyEnumerated; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java index 1fde022eda..6d33bfd7e9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java index 27ccdd778a..e29795bd1f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OrderColumn; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java index 507cdd0411..edd9b8a2b7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java index 303c98009e..5879d9cbb7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java @@ -19,13 +19,11 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortNatural; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java index 805f57fbfa..c819f08750 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.MapKeyJoinColumn; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java index 4026353ee9..b769356581 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java index e60536c504..0a0183ca1c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.MapKeyClass; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java index dee9921d8a..a5678d1faa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java @@ -27,7 +27,7 @@ import org.hibernate.annotations.Type; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java index eec8ecf714..dd89fd4466 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.OrderColumn; import org.hibernate.annotations.ListIndexBase; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java index 3bda5525f2..6a26bf2366 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java index 46c7700284..2d62700a18 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java @@ -18,12 +18,10 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.CollectionType; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java index b058a3a5e4..4a389f6b9e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java index e3ec4dca52..fb56212c7e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java @@ -19,13 +19,11 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortComparator; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java index 4f52eb0181..23fc5d5899 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java @@ -23,7 +23,7 @@ import jakarta.persistence.MapKeyTemporal; import jakarta.persistence.OneToMany; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java index fc0ce302a5..8ef3b7d9d1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.OrderColumn; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java index 345100b585..5dfd2ee17e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java index f6321356fe..bb6840cef8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java index 5e958c8a58..fed4b90abb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java @@ -18,13 +18,11 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortNatural; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java b/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java index 3c30b04d3e..8acd7eb668 100644 --- a/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java @@ -24,7 +24,7 @@ import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.AddressType; import org.hibernate.userguide.model.Call; import org.hibernate.userguide.model.CreditCardPayment; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java index 61e74d84ba..48f5b98a50 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java @@ -18,14 +18,11 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.Audited; import org.hibernate.envers.DefaultRevisionEntity; import org.hibernate.envers.RevisionEntity; import org.hibernate.envers.RevisionListener; -import org.hibernate.envers.configuration.EnversSettings; -import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java index 9fee481233..45da3d3a1e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.Audited; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java index 9deb69aa2b..1ecf307962 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java @@ -24,7 +24,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity; import org.hibernate.envers.RevisionEntity; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java index 676da476d9..0c028cbb82 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java @@ -31,7 +31,7 @@ import org.hibernate.envers.DefaultRevisionEntity; import org.hibernate.envers.ModifiedEntityNames; import org.hibernate.envers.RevisionEntity; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java index ab3b78664d..9d7a7eba6e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java @@ -36,7 +36,7 @@ import org.hibernate.envers.RevisionNumber; import org.hibernate.envers.RevisionTimestamp; import org.hibernate.envers.RevisionType; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java index eb601c13de..5ab704ce6d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java @@ -16,11 +16,8 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.Audited; -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.envers.RevisionEntity; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java index 2d4af319e2..55be047e18 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java @@ -25,7 +25,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java index 652fd4bfd6..0ffeaa8f9d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java @@ -28,7 +28,7 @@ import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java index 0d19bbb83d..dcc76d4325 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java @@ -23,7 +23,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java index 5beb9a4054..d2a9184d75 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java @@ -15,7 +15,7 @@ import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.Audited; import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java index 32902e89fb..3e589de95f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.ExcludeSuperclassListeners; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java b/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java index 8e75804efb..01c47337a2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java @@ -18,7 +18,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.type.Type; import org.junit.Before; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java index 2b748dd85c..fadfa3c85c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java @@ -14,14 +14,11 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java index 506ed51b05..97c179c0e6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java @@ -13,13 +13,11 @@ import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java index 24ea43f401..8d7038ace1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java @@ -18,12 +18,10 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java index 2d8a4e591b..e675c5f1fc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java @@ -18,12 +18,10 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java index 7c103452d9..edcabe1522 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java @@ -18,12 +18,10 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java index b6f50536c7..ceb1e1aa3c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java @@ -20,19 +20,14 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Root; -import org.hibernate.Session; import org.hibernate.annotations.ColumnTransformer; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.FetchProfile; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java index e07d98e8aa..2f1ff66c3f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java @@ -23,15 +23,12 @@ import jakarta.persistence.QueryHint; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.annotations.NaturalId; -import org.hibernate.annotations.QueryHints; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java index 13a577887c..b323e34f73 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java @@ -19,12 +19,10 @@ import jakarta.persistence.OrderColumn; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java index c739cdcee8..4c634524d8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java @@ -22,13 +22,11 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchProfile; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNotNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java index 6e40236def..a319ff37e7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java @@ -18,12 +18,10 @@ import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertTrue; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java index 867221b013..214efa557c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java @@ -14,12 +14,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertTrue; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java index 6222509b38..1cfacff019 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java @@ -17,12 +17,10 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.junit.Assert.assertTrue; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java index 6e73af07a9..d40222ebde 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java @@ -9,12 +9,10 @@ package org.hibernate.userguide.flush; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java index 997a9f07e2..1b00a35620 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java @@ -13,9 +13,6 @@ import jakarta.persistence.FlushModeType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; - import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java index f9a4fca7d3..866ece05a5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java @@ -18,12 +18,10 @@ import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertTrue; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java index 2838cfc57c..01f45412fe 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java @@ -31,7 +31,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.type.StringType; import org.hibernate.userguide.model.AddressType; import org.hibernate.userguide.model.Call; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java index 32f8f14af3..a034915e77 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java @@ -17,7 +17,7 @@ import org.hibernate.Session; import org.hibernate.boot.spi.MetadataBuilderContributor; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.type.StandardBasicTypes; import org.hibernate.testing.RequiresDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java index 1427f5c827..92943c78d2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.After; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java index 723b8ccad6..881ff53e3b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java @@ -19,15 +19,12 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java b/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java index a2af3e78c3..3bf6a95ed9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java @@ -15,12 +15,10 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import org.hibernate.annotations.Immutable; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java b/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java index 92cf524d21..ccce2f8475 100644 --- a/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java @@ -11,12 +11,10 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java index aa03147442..83eea8b36b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.InheritanceType; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java index 2d5ef9715e..f2826ea567 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.InheritanceType; import org.hibernate.Session; import org.hibernate.annotations.DiscriminatorOptions; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java index 96c3edc9fb..bf434da16f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; import jakarta.persistence.PrimaryKeyJoinColumn; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java index db590bfe35..2d9e2d0d0e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java index 4a318104b1..6996771c18 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.MappedSuperclass; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java index ae3e745422..44e1ed554b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.InheritanceType; import org.hibernate.annotations.DiscriminatorFormula; import org.hibernate.dialect.PostgreSQL81Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Assert; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java index 2123e7bb78..8859cbc934 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java index 640fec270d..3918997fe1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java index bf1f985742..c676b2be46 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Version; import org.hibernate.annotations.Polymorphism; import org.hibernate.annotations.PolymorphismType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java b/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java index b17ff34d5c..d1610c56a4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java @@ -11,14 +11,11 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java index 05e8cf9a78..3e3f69ad8e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java @@ -24,14 +24,12 @@ import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java index b9d1804ea9..0630ce48e7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Version; import org.hibernate.annotations.OptimisticLock; import org.hibernate.dialect.CockroachDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java index a12adb3474..d763f9556b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java @@ -14,12 +14,10 @@ import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; import org.hibernate.annotations.OptimisticLocking; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java index d552e573b8..51c5374af5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java @@ -15,12 +15,10 @@ import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; import org.hibernate.annotations.OptimisticLocking; import org.hibernate.annotations.SelectBeforeUpdate; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java index 3e3e134db2..480b18e03b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java @@ -6,7 +6,6 @@ */ package org.hibernate.userguide.locking; -import java.sql.Timestamp; import java.time.Instant; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Version; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java index 67ccd57226..c07eba92f2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.Version; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java index 593fa1626c..0791b39406 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Version; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java index fdbfca7869..5a870ae6af 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Version; import org.hibernate.annotations.Source; import org.hibernate.annotations.SourceType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java index 7dd4b87bd6..5679cace59 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java index 086956ef58..565bcfbeaf 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java index ff52a63f35..2bc2728718 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java @@ -9,9 +9,7 @@ package org.hibernate.userguide.mapping.access; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.Session; -import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java index 19f375ffcf..11e6da49a1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Version; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java index 34672b9897..d39461cf91 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.mapping.access; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java index 4e62727c7b..0fb75285ce 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java index 2044af9d0f..accef3d29f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Lob; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java index d979ea8901..0d131e579c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Lob; import org.hibernate.Session; import org.hibernate.engine.jdbc.BlobProxy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java index b5e795193a..7fdf9e0459 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java @@ -15,9 +15,8 @@ import jakarta.persistence.Id; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.junit.Assert; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java index 724f4b7409..1229e6591d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Lob; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java index 38215aaa21..fbc5486dbb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Lob; import org.hibernate.Session; import org.hibernate.engine.jdbc.ClobProxy; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java index 79fdc4eb37..498715bfa8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.orm.junit.NotImplementedYet; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java index 1a6907bb75..a2348ef815 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java index 1ebb189d2f..b4763a08f9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java index 7ba7462dd7..71720938b7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java index d4572ff6e3..efe56fde53 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Converter; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java index 8a58bac9a6..42cd7f6448 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.annotations.Type; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java index a4ab4e42b7..3ff3dec6dc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Basic; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java index f1e2fed532..2cf1ec4e84 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java index 4f2837e976..ba9cfada19 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.mapping.basic; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java index 2d01dede14..cb0f8df5bb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.annotations.Formula; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java index 3407ed3bf5..6deb180ee6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.mapping.basic; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java index 5d0170466b..8fae8d0b76 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java index c13ae636cc..702e332d70 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java index 1aa5bcee1d..b135948417 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java index c547bc8585..52e0895f25 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java index c83326e25e..42fb621d7d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java @@ -11,10 +11,8 @@ import jakarta.persistence.Id; import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.RequiresDialectFeature; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java index 180d4c052a..c8fa6b47fe 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.annotations.Nationalized; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java index 8f883f1a4e..7866ecf7f9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.annotations.Target; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java index 4053fe3e93..4d56ecee4c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.PhoneType; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java index 8b0363ea1e..4965cf9f6f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.PhoneType; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java index 0d2e82aeb3..759ef32eec 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java index 0db63286ed..34ac1130f1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.annotations.Target; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java index 2195b29371..fa156b899c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java index c3c54fa2c9..48abdc81f4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Convert; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java index 5f08d3260c..8734b3a36d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverterHbmTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverterHbmTest.java index 8779ecf228..97a506653e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverterHbmTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverterHbmTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.mapping.converter.hbm; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/DynamicEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/DynamicEntityTest.java index be465e6ee4..546e08aefc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/DynamicEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/DynamicEntityTest.java @@ -9,9 +9,8 @@ package org.hibernate.userguide.mapping.dynamic; import java.util.HashMap; import java.util.Map; -import org.hibernate.EntityMode; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java index 7a28104415..ba454e9597 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java index 106e0760b3..a5d6190027 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java index 193a175be3..659980dee8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.annotations.Target; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java index d889a8855e..68a42afec1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java index 06f892707d..6dff741c1c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java index 9852f77327..0173fa332b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.annotations.Target; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java index 26417c1f0a..83b48591b3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java index 2b810c36c4..4f393796cb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.ValueGenerationType; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.tuple.AnnotationValueGeneration; import org.hibernate.tuple.GenerationTiming; import org.hibernate.tuple.ValueGenerator; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java index 3763fe1cfc..620fa86a64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; import org.hibernate.dialect.SQLServer2005Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java index 3bf885d37e..a6c484f8a8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.GenerationTime; import org.hibernate.annotations.GeneratorType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.tuple.ValueGenerator; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java index 984d96c4ab..7c93436dce 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.annotations.ValueGenerationType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.tuple.AnnotationValueGeneration; import org.hibernate.tuple.GenerationTiming; import org.hibernate.tuple.ValueGenerator; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java index bdea5fd8e8..0af8d501b8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java index 96b772e6b2..661643c53c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.mapping.identifier; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java index 6031aa035f..85d5eba3df 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java @@ -9,8 +9,6 @@ package org.hibernate.userguide.mapping.identifier; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; - /** * @author Vlad Mihalcea */ diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java index 09e7f467b6..5e95888389 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java @@ -12,7 +12,7 @@ import org.hibernate.Session; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java index 6d97daf27b..c66c2eb87a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java index cd3d335088..c1a97d95b5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java index 3ebf1be29f..6f27df247a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java index 05948b3013..f330695be9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java @@ -11,11 +11,9 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.RequiresDialectFeature; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java index 0dac13675b..ece6ddfb5b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java @@ -10,9 +10,8 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java index 0726addbb7..9c70228504 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java index 8cc46382ca..8325de5b9a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java @@ -13,9 +13,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.IdClass; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.junit.Before; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java index 787e940d2b..421eb44cc6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.ManyToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java index 93ccacfcad..f417515d3f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.IdClass; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java index 8ad3da3100..1c7437e803 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java @@ -14,9 +14,8 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.ManyToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.junit.Before; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java index f92224d165..f6bc6bbc23 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java index 4ba0aa3591..46be791f5a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java index 19a8e53f2f..abf9377aff 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java index ddbca05472..ba651998f9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java index 565640da08..4de149e9d7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java index 50c9c2e56c..ea2dbe76b5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java @@ -10,10 +10,9 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.annotations.Formula; import org.hibernate.annotations.RowId; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java index f202ffd248..0e66eb8821 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.SequenceGenerator; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java index acde5390e6..2f9de16969 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java @@ -13,9 +13,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.SequenceGenerator; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Parameter; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java index ee14389f2d..7945b41f36 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java index 25e0edc793..083ec086eb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java index ca8d4aaf35..4d5910d5fc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java @@ -7,7 +7,6 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; -import java.util.Objects; import java.util.Set; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; @@ -16,7 +15,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java index f78e709d7c..546c811600 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java index c2e7883aeb..134fe91785 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.TableGenerator; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java index 8f058fe5e0..e6e47f780e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java @@ -12,10 +12,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.RequiresDialectFeature; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java index c53f058f50..ca39897790 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java index 5f1ad46303..2b8f1949c4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java index 9e6861375e..4223b0d961 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdDatabaseGeneratedValueTest.java @@ -10,7 +10,7 @@ import java.sql.Timestamp; import java.time.OffsetDateTime; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java index 72de5a8146..d0fa1a83bc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EmbeddedIdInMemoryGeneratedValueTest.java @@ -8,7 +8,7 @@ package org.hibernate.userguide.mapping.identifier.composite; import java.sql.Timestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java index 168b06d9f8..f7e3d8c1d2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeDetachTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeDetachTest.java index 9490f954ca..2f49d2b5e5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeDetachTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeDetachTest.java @@ -1,6 +1,6 @@ package org.hibernate.userguide.pc; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeLockTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeLockTest.java index 4196f531b3..3631d680d6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeLockTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeLockTest.java @@ -3,7 +3,7 @@ package org.hibernate.userguide.pc; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeMergeTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeMergeTest.java index caf0ed1186..ebbb4f5075 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeMergeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeMergeTest.java @@ -1,6 +1,6 @@ package org.hibernate.userguide.pc; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java index 95d705aaf2..baa338e208 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.OneToMany; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java index 6fc319ee1e..4b0c20290f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java @@ -9,7 +9,7 @@ import jakarta.persistence.ManyToOne; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadePersistTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadePersistTest.java index d1c66d1713..f8a513ec08 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadePersistTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadePersistTest.java @@ -1,6 +1,6 @@ package org.hibernate.userguide.pc; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRefreshTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRefreshTest.java index 47149536f8..c56ec99db7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRefreshTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRefreshTest.java @@ -1,6 +1,6 @@ package org.hibernate.userguide.pc; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRemoveTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRemoveTest.java index d66e4b493e..a01ea418ee 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRemoveTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeRemoveTest.java @@ -1,6 +1,6 @@ package org.hibernate.userguide.pc; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeReplicateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeReplicateTest.java index 387928fddf..5863ee3578 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeReplicateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeReplicateTest.java @@ -2,7 +2,7 @@ package org.hibernate.userguide.pc; import org.hibernate.ReplicationMode; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java index ce575a30f0..722de10077 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java index 919b28bf75..eb4cda045f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java @@ -21,7 +21,7 @@ import org.hibernate.Session; import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.FilterJoinTable; import org.hibernate.annotations.ParamDef; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java index 6c7066bc11..49ba4ec2ae 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java @@ -6,8 +6,6 @@ */ package org.hibernate.userguide.pc; -import java.sql.Timestamp; -import java.util.ArrayList; import java.util.List; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -27,13 +25,11 @@ import org.hibernate.annotations.ParamDef; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SqlFragmentAlias; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java index 72ad7cfbda..a6a6819f6a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java @@ -24,7 +24,7 @@ import org.hibernate.Session; import org.hibernate.annotations.Filter; import org.hibernate.annotations.FilterDef; import org.hibernate.annotations.ParamDef; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java index f74fc7acda..e5509d2c77 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java @@ -17,9 +17,8 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java index e8aa9155fa..8ebf00af9e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java @@ -10,8 +10,7 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java index 98dd319628..315c123aef 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java @@ -26,12 +26,10 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.annotations.NaturalId; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java index cad750a29e..60fa3ab5c4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.ManyToMany; import org.hibernate.Session; import org.hibernate.annotations.WhereJoinTable; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java index 005a4ae87c..87b3f0dbfc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.annotations.Where; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java index 500b3ce2b0..3f9f2cc1de 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java @@ -14,7 +14,7 @@ import org.hibernate.annotations.Check; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.PostgreSQL81Dialect; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java index 3dc091660e..d8e89bbbd3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java index 2c6e3def64..11499cba13 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java @@ -18,10 +18,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.util.ExceptionUtil; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java index ef8bb757c0..f94bf66a9b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.NaturalId; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQL81Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java index 0f3cc95cc1..0a9ec0b395 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java @@ -17,10 +17,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.util.ExceptionUtil; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java index 78c1180c64..616a66bf79 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java @@ -26,15 +26,13 @@ import org.hibernate.annotations.SQLInsert; import org.hibernate.annotations.SQLUpdate; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java index 3c9bdd17f3..70b283411d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java @@ -24,14 +24,12 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLInsert; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java index e93bcf601d..88e112838b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java @@ -26,14 +26,12 @@ import org.hibernate.annotations.SQLUpdate; import org.hibernate.annotations.Where; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java index 921452cce8..c1b935cd9a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.MySQL5Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Output; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java index fca90ff534..23178bb61a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java @@ -19,14 +19,12 @@ import org.hibernate.annotations.ResultCheckStyle; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLInsert; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Before; import org.junit.Test; -import org.jboss.logging.Logger; - import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java index a3082e6f19..3ec540ecb8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Output; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java index f3ed763a49..4bf4d1aaa9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java @@ -17,10 +17,8 @@ import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.loader.NonUniqueDiscoveredSqlAliasException; -import org.hibernate.transform.DistinctRootEntityResultTransformer; -import org.hibernate.transform.RootEntityResultTransformer; import org.hibernate.transform.Transformers; import org.hibernate.type.LongType; import org.hibernate.type.StringType; diff --git a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java index 07c39ba988..9a52aad476 100644 --- a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java @@ -17,7 +17,7 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.resource.transaction.spi.TransactionStatus; import org.junit.Test; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixDialectTestCase.java index 3775023a16..fb40e6b988 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixDialectTestCase.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixDialectTestCase.java @@ -9,7 +9,7 @@ package org.hibernate.community.dialect; import java.util.Collections; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.jpa.JpaComplianceStub; +import org.hibernate.orm.test.jpa.JpaComplianceStub; import org.hibernate.metamodel.model.domain.internal.JpaMetamodelImpl; import org.hibernate.query.criteria.ValueHandlingMode; import org.hibernate.query.internal.NamedObjectRepositoryImpl; diff --git a/hibernate-core/src/test/bundles/templates/cfgxmlpar/META-INF/persistence.xml b/hibernate-core/src/test/bundles/templates/cfgxmlpar/META-INF/persistence.xml index c04ccbb9d3..037b2d46f4 100644 --- a/hibernate-core/src/test/bundles/templates/cfgxmlpar/META-INF/persistence.xml +++ b/hibernate-core/src/test/bundles/templates/cfgxmlpar/META-INF/persistence.xml @@ -14,7 +14,7 @@ org.hibernate.jpa.HibernatePersistenceProvider - + diff --git a/hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml b/hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/orm/test/jpa/pack/cfgxmlpar/hibernate.cfg.xml similarity index 79% rename from hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml rename to hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/orm/test/jpa/pack/cfgxmlpar/hibernate.cfg.xml index 7ae30207f7..13dc09a516 100644 --- a/hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml +++ b/hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/orm/test/jpa/pack/cfgxmlpar/hibernate.cfg.xml @@ -25,12 +25,12 @@ true value org.hibernate.testing.cache.CachingRegionFactory - - - - - - + + + + + + \ No newline at end of file diff --git a/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/orm.xml b/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/orm.xml index a7c41e04f2..1739ac35c6 100644 --- a/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/orm.xml +++ b/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/orm.xml @@ -14,13 +14,13 @@ - + - org.hibernate.jpa.test.pack.defaultpar + org.hibernate.orm.test.jpa.pack.defaultpar diff --git a/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/persistence.xml b/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/persistence.xml index 72ae3cdd59..cbfd2b8aa6 100644 --- a/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/persistence.xml +++ b/hibernate-core/src/test/bundles/templates/defaultpar/META-INF/persistence.xml @@ -12,7 +12,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0"> - org.hibernate.jpa.test.pack.defaultpar.Lighter + org.hibernate.orm.test.jpa.pack.defaultpar.Lighter CALLBACK diff --git a/hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml b/hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.hbm.xml similarity index 91% rename from hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml rename to hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.hbm.xml index 4f2e7a8c44..01cb136ade 100644 --- a/hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml +++ b/hibernate-core/src/test/bundles/templates/defaultpar/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/orm.xml b/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/orm.xml index b93175223c..0c315e3333 100644 --- a/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/orm.xml +++ b/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/orm.xml @@ -15,14 +15,14 @@ - + - org.hibernate.jpa.test.pack.defaultpar_1_0 - + org.hibernate.orm.test.jpa.pack.defaultpar_1_0 + @@ -30,7 +30,7 @@ - + diff --git a/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/persistence.xml b/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/persistence.xml index c754da627e..635e61e92b 100644 --- a/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/persistence.xml +++ b/hibernate-core/src/test/bundles/templates/defaultpar_1_0/META-INF/persistence.xml @@ -12,7 +12,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0"> - org.hibernate.jpa.test.pack.defaultpar.Lighter + org.hibernate.orm.test.jpa.pack.defaultpar.Lighter diff --git a/hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml b/hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.hbm.xml similarity index 90% rename from hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml rename to hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.hbm.xml index a8706a3cae..1263a5bd03 100644 --- a/hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml +++ b/hibernate-core/src/test/bundles/templates/defaultpar_1_0/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml b/hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/orm/test/jpa/pack/excludehbmpar/Mouse.hbm.xml similarity index 90% rename from hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml rename to hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/orm/test/jpa/pack/excludehbmpar/Mouse.hbm.xml index 696949449d..9535e02898 100644 --- a/hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml +++ b/hibernate-core/src/test/bundles/templates/excludehbmpar/org/hibernate/orm/test/jpa/pack/excludehbmpar/Mouse.hbm.xml @@ -10,7 +10,7 @@ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> diff --git a/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/orm.xml b/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/orm.xml index c42dd0ac54..5d654e3807 100644 --- a/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/orm.xml +++ b/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/orm.xml @@ -11,7 +11,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" version="2.0" > - org.hibernate.jpa.test.pack.various + org.hibernate.orm.test.jpa.pack.various diff --git a/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/persistence.xml b/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/persistence.xml index 9164d45672..6d1980e824 100644 --- a/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/persistence.xml +++ b/hibernate-core/src/test/bundles/templates/explicitpar/META-INF/persistence.xml @@ -11,10 +11,10 @@ version="2.0"> @buildDirName@/packages/externaljar.jar - org.hibernate.jpa.test.Cat - org.hibernate.jpa.test.Kitten - org.hibernate.jpa.test.Distributor - org.hibernate.jpa.test.Item + org.hibernate.orm.test.jpa.Cat + org.hibernate.orm.test.jpa.Kitten + org.hibernate.orm.test.jpa.Distributor + org.hibernate.orm.test.jpa.Item true @@ -34,15 +34,15 @@ - + - - + - + diff --git a/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/orm.xml b/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/orm.xml index c42dd0ac54..5d654e3807 100644 --- a/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/orm.xml +++ b/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/orm.xml @@ -11,7 +11,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" version="2.0" > - org.hibernate.jpa.test.pack.various + org.hibernate.orm.test.jpa.pack.various diff --git a/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/persistence.xml b/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/persistence.xml index f72527911d..55a78851b8 100644 --- a/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/persistence.xml +++ b/hibernate-core/src/test/bundles/templates/explicitpar2/META-INF/persistence.xml @@ -12,10 +12,10 @@ META-INF/externaljar2.jar - org.hibernate.jpa.test.Cat - org.hibernate.jpa.test.Kitten - org.hibernate.jpa.test.Distributor - org.hibernate.jpa.test.Item + org.hibernate.orm.test.jpa.Cat + org.hibernate.orm.test.jpa.Kitten + org.hibernate.orm.test.jpa.Distributor + org.hibernate.orm.test.jpa.Item true @@ -34,15 +34,15 @@ - + - - + - + diff --git a/hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml b/hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.hbm.xml similarity index 88% rename from hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml rename to hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.hbm.xml index 85b8c0b257..31c87e7172 100644 --- a/hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml +++ b/hibernate-core/src/test/bundles/templates/explodedpar/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/bundles/templates/externaljar/META-INF/orm.xml b/hibernate-core/src/test/bundles/templates/externaljar/META-INF/orm.xml index 0ac6032248..d5e6ac140b 100644 --- a/hibernate-core/src/test/bundles/templates/externaljar/META-INF/orm.xml +++ b/hibernate-core/src/test/bundles/templates/externaljar/META-INF/orm.xml @@ -11,7 +11,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" version="2.0" > - org.hibernate.jpa.test.pack.various + org.hibernate.orm.test.jpa.pack.various diff --git a/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/orm.xml b/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/orm.xml index 27838b8f6d..8ea4640bde 100644 --- a/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/orm.xml +++ b/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/orm.xml @@ -14,14 +14,14 @@ - + - org.hibernate.jpa.test.pack.defaultpar + org.hibernate.orm.test.jpa.pack.defaultpar diff --git a/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/persistence.xml b/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/persistence.xml index 4f61dc82a1..4c2f262f41 100644 --- a/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/persistence.xml +++ b/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/META-INF/persistence.xml @@ -12,7 +12,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0"> - org.hibernate.jpa.test.pack.defaultpar.Lighter + org.hibernate.orm.test.jpa.pack.defaultpar.Lighter diff --git a/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml b/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/orm/test/jpa/pack/war/Mouse.hbm.xml similarity index 90% rename from hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml rename to hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/orm/test/jpa/pack/war/Mouse.hbm.xml index 23210c78c8..39284f3cba 100644 --- a/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml +++ b/hibernate-core/src/test/bundles/templates/war/WEB-INF/classes/org/hibernate/orm/test/jpa/pack/war/Mouse.hbm.xml @@ -9,7 +9,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> - + diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java index 6f5a015da0..278e48e2a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/NestedEmbeddableTest.java @@ -35,7 +35,7 @@ import jakarta.persistence.OrderBy; import jakarta.persistence.Table; import org.hibernate.annotations.Type; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/QuotingTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/QuotingTest.java index 2554014452..0d233f09d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/QuotingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/mapping/QuotingTest.java @@ -9,7 +9,7 @@ package org.hibernate.jpa.test.mapping; import org.junit.Ignore; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java index 1d8da6d00f..f1cc8a15bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractJpaMetamodelPopulationTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.metamodel.EntityType; import jakarta.persistence.metamodel.Metamodel; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractMetamodelSpecificTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractMetamodelSpecificTest.java index dc76b227c7..9a79658665 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractMetamodelSpecificTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/AbstractMetamodelSpecificTest.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.jpa.test.metamodel; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java index eeb6b5ff83..64b55f8c18 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/metamodel/EmbeddedTypeTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.metamodel.SingularAttribute; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java index 2cb4d2af53..fce0ef3179 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.annotations; import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java index d4e8f5d5fd..792d827ac1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.NaturalId; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java index a2d02de4a4..be1b9725d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryUpdateTimestampTest.java @@ -12,9 +12,8 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java index c20c29c51e..f354185d49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java @@ -25,7 +25,7 @@ import jakarta.persistence.TemporalType; import org.hibernate.Session; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java index 42647b2b49..7fbac43808 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.annotations; import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java index 053adc1e8d..69244de631 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.ManyToOne; import org.hibernate.LazyInitializationException; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java index a9a006bad8..a43b26a882 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java @@ -17,15 +17,13 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import org.hibernate.LazyInitializationException; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; -import org.hibernate.boot.model.process.internal.ScanningCoordinator; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.logger.LoggerInspectionRule; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java index 0944afa020..07a391ffaa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToManyNotIgnoreLazyFetchingTest.java @@ -20,13 +20,11 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import org.hibernate.LazyInitializationException; -import org.hibernate.annotations.JoinColumnOrFormula; -import org.hibernate.annotations.JoinFormula; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.logger.LoggerInspectionRule; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java index f8036c49ef..90ce73feec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java @@ -24,7 +24,7 @@ import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.logger.LoggerInspectionRule; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java index 1fa8b5a543..d39ad876f4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderWithInvalidQueryTest.java @@ -13,9 +13,8 @@ import jakarta.persistence.Id; import org.hibernate.HibernateException; import org.hibernate.annotations.Loader; -import org.hibernate.annotations.NamedNativeQueries; import org.hibernate.annotations.NamedQuery; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.util.ExceptionUtil; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java index b1f30c5538..cda86305b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.MapsId; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.DialectChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java index 092cd2f1e3..52c53dc498 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java @@ -21,7 +21,7 @@ import org.hibernate.annotations.OptimisticLockType; import org.hibernate.annotations.OptimisticLocking; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java index d486209518..362723fbb6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchingEntityLoaderInitializationWithNoLockModeTest.java @@ -16,7 +16,7 @@ import org.hibernate.LockOptions; import org.hibernate.annotations.Fetch; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.loader.BatchFetchStyle; import org.hibernate.metamodel.spi.MetamodelImplementor; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java index bdb2556d05..e11cba2216 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/JarVisitorTest.java @@ -35,8 +35,8 @@ import org.hibernate.boot.archive.scan.spi.ScanEnvironment; import org.hibernate.boot.archive.scan.spi.ScanResult; import org.hibernate.boot.archive.spi.ArchiveDescriptor; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.pack.defaultpar.Version; -import org.hibernate.jpa.test.pack.explodedpar.Carpet; +import org.hibernate.orm.test.jpa.pack.defaultpar.Version; +import org.hibernate.orm.test.jpa.pack.explodedpar.Carpet; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.RequiresDialect; @@ -121,7 +121,7 @@ public class JarVisitorTest extends PackagingTestCase { addPackageToClasspath( defaultPar ); ScanResult result = standardScan( defaultPar.toURL() ); - validateResults( result, org.hibernate.jpa.test.pack.defaultpar.ApplicationServer.class, Version.class ); + validateResults( result, org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer.class, Version.class ); } private void validateResults(ScanResult scanResult, Class... expectedClasses) throws IOException { @@ -172,7 +172,7 @@ public class JarVisitorTest extends PackagingTestCase { validateResults( collector.toScanResult(), - org.hibernate.jpa.test.pack.defaultpar.ApplicationServer.class, + org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer.class, Version.class ); @@ -196,7 +196,7 @@ public class JarVisitorTest extends PackagingTestCase { ); validateResults( collector.toScanResult(), - org.hibernate.jpa.test.pack.defaultpar.ApplicationServer.class, + org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer.class, Version.class ); } @@ -228,8 +228,8 @@ public class JarVisitorTest extends PackagingTestCase { validateResults( collector.toScanResult(), - org.hibernate.jpa.test.pack.war.ApplicationServer.class, - org.hibernate.jpa.test.pack.war.Version.class + org.hibernate.orm.test.jpa.pack.war.ApplicationServer.class, + org.hibernate.orm.test.jpa.pack.war.Version.class ); } @@ -241,7 +241,7 @@ public class JarVisitorTest extends PackagingTestCase { ScanResult result = standardScan( defaultPar.toURL() ); validateResults( result, - org.hibernate.jpa.test.pack.defaultpar.ApplicationServer.class, + org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer.class, Version.class ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java index 7dc4bb8498..236f8c4da9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagedEntityManagerTest.java @@ -21,29 +21,28 @@ import org.hibernate.event.spi.EventType; import org.hibernate.internal.util.ConfigHelper; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.HibernateEntityManagerFactory; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; -import org.hibernate.jpa.test.pack.cfgxmlpar.Morito; -import org.hibernate.jpa.test.pack.defaultpar.ApplicationServer; -import org.hibernate.jpa.test.pack.defaultpar.IncrementListener; -import org.hibernate.jpa.test.pack.defaultpar.Lighter; -import org.hibernate.jpa.test.pack.defaultpar.Money; -import org.hibernate.jpa.test.pack.defaultpar.Mouse; -import org.hibernate.jpa.test.pack.defaultpar.OtherIncrementListener; -import org.hibernate.jpa.test.pack.defaultpar.Version; -import org.hibernate.jpa.test.pack.defaultpar_1_0.ApplicationServer1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Lighter1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Mouse1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Version1; -import org.hibernate.jpa.test.pack.excludehbmpar.Caipirinha; -import org.hibernate.jpa.test.pack.explodedpar.Carpet; -import org.hibernate.jpa.test.pack.explodedpar.Elephant; -import org.hibernate.jpa.test.pack.externaljar.Scooter; -import org.hibernate.jpa.test.pack.various.Airplane; -import org.hibernate.jpa.test.pack.various.Seat; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; +import org.hibernate.orm.test.jpa.pack.cfgxmlpar.Morito; +import org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer; +import org.hibernate.orm.test.jpa.pack.defaultpar.IncrementListener; +import org.hibernate.orm.test.jpa.pack.defaultpar.Lighter; +import org.hibernate.orm.test.jpa.pack.defaultpar.Money; +import org.hibernate.orm.test.jpa.pack.defaultpar.Mouse; +import org.hibernate.orm.test.jpa.pack.defaultpar.OtherIncrementListener; +import org.hibernate.orm.test.jpa.pack.defaultpar.Version; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.ApplicationServer1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Lighter1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Mouse1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Version1; +import org.hibernate.orm.test.jpa.pack.excludehbmpar.Caipirinha; +import org.hibernate.orm.test.jpa.pack.explodedpar.Carpet; +import org.hibernate.orm.test.jpa.pack.explodedpar.Elephant; +import org.hibernate.orm.test.jpa.pack.externaljar.Scooter; +import org.hibernate.orm.test.jpa.pack.various.Airplane; +import org.hibernate.orm.test.jpa.pack.various.Seat; import org.hibernate.stat.Statistics; -import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -263,7 +262,7 @@ public class PackagedEntityManagerTest extends PackagingTestCase { emf = Persistence.createEntityManagerFactory( "space par", new HashMap() ); TransactionUtil.doInJPA( () -> emf, em -> { - org.hibernate.jpa.test.pack.spacepar.Bug bug = new org.hibernate.jpa.test.pack.spacepar.Bug(); + org.hibernate.orm.test.jpa.pack.spacepar.Bug bug = new org.hibernate.orm.test.jpa.pack.spacepar.Bug(); bug.setSubject( "Spaces in directory name don't play well on Windows" ); em.persist( bug ); em.flush(); @@ -285,7 +284,7 @@ public class PackagedEntityManagerTest extends PackagingTestCase { properties.putAll( p ); emf = Persistence.createEntityManagerFactory( "overridenpar", properties ); TransactionUtil.doInJPA( () -> emf, em -> { - org.hibernate.jpa.test.pack.overridenpar.Bug bug = new org.hibernate.jpa.test.pack.overridenpar.Bug(); + org.hibernate.orm.test.jpa.pack.overridenpar.Bug bug = new org.hibernate.orm.test.jpa.pack.overridenpar.Bug(); bug.setSubject( "Allow DS overriding" ); em.persist( bug ); em.flush(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java index c33883afa2..fbb21a367e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/PackagingTestCase.java @@ -14,31 +14,31 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.hibernate.jpa.test.Cat; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; -import org.hibernate.jpa.test.Kitten; -import org.hibernate.jpa.test.pack.cfgxmlpar.Morito; -import org.hibernate.jpa.test.pack.defaultpar.ApplicationServer; -import org.hibernate.jpa.test.pack.defaultpar.IncrementListener; -import org.hibernate.jpa.test.pack.defaultpar.Lighter; -import org.hibernate.jpa.test.pack.defaultpar.Money; -import org.hibernate.jpa.test.pack.defaultpar.Mouse; -import org.hibernate.jpa.test.pack.defaultpar.OtherIncrementListener; -import org.hibernate.jpa.test.pack.defaultpar.Version; -import org.hibernate.jpa.test.pack.defaultpar_1_0.ApplicationServer1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.IncrementListener1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Lighter1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Money1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Mouse1; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Version1; -import org.hibernate.jpa.test.pack.excludehbmpar.Caipirinha; -import org.hibernate.jpa.test.pack.explodedpar.Carpet; -import org.hibernate.jpa.test.pack.explodedpar.Elephant; -import org.hibernate.jpa.test.pack.externaljar.Scooter; -import org.hibernate.jpa.test.pack.spacepar.Bug; -import org.hibernate.jpa.test.pack.various.Airplane; -import org.hibernate.jpa.test.pack.various.Seat; +import org.hibernate.orm.test.jpa.Cat; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; +import org.hibernate.orm.test.jpa.Kitten; +import org.hibernate.orm.test.jpa.pack.cfgxmlpar.Morito; +import org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer; +import org.hibernate.orm.test.jpa.pack.defaultpar.IncrementListener; +import org.hibernate.orm.test.jpa.pack.defaultpar.Lighter; +import org.hibernate.orm.test.jpa.pack.defaultpar.Money; +import org.hibernate.orm.test.jpa.pack.defaultpar.Mouse; +import org.hibernate.orm.test.jpa.pack.defaultpar.OtherIncrementListener; +import org.hibernate.orm.test.jpa.pack.defaultpar.Version; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.ApplicationServer1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.IncrementListener1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Lighter1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Money1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Mouse1; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Version1; +import org.hibernate.orm.test.jpa.pack.excludehbmpar.Caipirinha; +import org.hibernate.orm.test.jpa.pack.explodedpar.Carpet; +import org.hibernate.orm.test.jpa.pack.explodedpar.Elephant; +import org.hibernate.orm.test.jpa.pack.externaljar.Scooter; +import org.hibernate.orm.test.jpa.pack.spacepar.Bug; +import org.hibernate.orm.test.jpa.pack.various.Airplane; +import org.hibernate.orm.test.jpa.pack.various.Seat; import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest; @@ -161,11 +161,11 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest path = ArchivePaths.create( "META-INF/persistence.xml" ); archive.addAsResource( "defaultpar/META-INF/persistence.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml" ); - archive.addAsResource( "defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.hbm.xml" ); + archive.addAsResource( "defaultpar/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.hbm.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/defaultpar/package-info.class" ); - archive.addAsResource( "org/hibernate/jpa/test/pack/defaultpar/package-info.class", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/defaultpar/package-info.class" ); + archive.addAsResource( "org/hibernate/orm/test/jpa/pack/defaultpar/package-info.class", path ); File testPackage = new File( packageTargetDir, fileName ); @@ -190,11 +190,11 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest path = ArchivePaths.create( "META-INF/persistence.xml" ); archive.addAsResource( "defaultpar_1_0/META-INF/persistence.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse.hbm.xml" ); - archive.addAsResource( "defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse.hbm.xml" ); + archive.addAsResource( "defaultpar_1_0/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.hbm.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/defaultpar_1_0/package-info.class" ); - archive.addAsResource( "org/hibernate/jpa/test/pack/defaultpar_1_0/package-info.class", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.class" ); + archive.addAsResource( "org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.class", path ); File testPackage = new File( packageTargetDir, fileName ); @@ -265,11 +265,11 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest ArchivePath path = ArchivePaths.create( "META-INF/persistence.xml" ); archive.addAsResource( "explodedpar/META-INF/persistence.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml" ); - archive.addAsResource( "explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.hbm.xml" ); + archive.addAsResource( "explodedpar/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.hbm.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/explodedpar/package-info.class" ); - archive.addAsResource( "org/hibernate/jpa/test/pack/explodedpar/package-info.class", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/explodedpar/package-info.class" ); + archive.addAsResource( "org/hibernate/orm/test/jpa/pack/explodedpar/package-info.class", path ); File testPackage = new File( packageTargetDir, fileName ); archive.as( ExplodedExporter.class ).exportExploded( packageTargetDir ); @@ -289,8 +289,8 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest path = ArchivePaths.create( "META-INF/persistence.xml" ); archive.addAsResource( "excludehbmpar/META-INF/persistence.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml" ); - archive.addAsResource( "excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/excludehbmpar/Mouse.hbm.xml" ); + archive.addAsResource( "excludehbmpar/org/hibernate/orm/test/jpa/pack/excludehbmpar/Mouse.hbm.xml", path ); File testPackage = new File( packageTargetDir, fileName ); archive.as( ZipExporter.class ).exportTo( testPackage, true ); @@ -308,8 +308,8 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest ArchivePath path = ArchivePaths.create( "META-INF/persistence.xml" ); archive.addAsResource( "cfgxmlpar/META-INF/persistence.xml", path ); - path = ArchivePaths.create( "org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml" ); - archive.addAsResource( "cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml", path ); + path = ArchivePaths.create( "org/hibernate/orm/test/jpa/pack/cfgxmlpar/hibernate.cfg.xml" ); + archive.addAsResource( "cfgxmlpar/org/hibernate/orm/test/jpa/pack/cfgxmlpar/hibernate.cfg.xml", path ); File testPackage = new File( packageTargetDir, fileName ); archive.as( ZipExporter.class ).exportTo( testPackage, true ); @@ -335,7 +335,7 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest String fileName = "overridenpar.jar"; JavaArchive archive = ShrinkWrap.create( JavaArchive.class, fileName ); archive.addClasses( - org.hibernate.jpa.test.pack.overridenpar.Bug.class + org.hibernate.orm.test.jpa.pack.overridenpar.Bug.class ); ArchivePath path = ArchivePaths.create( "META-INF/persistence.xml" ); @@ -400,13 +400,13 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest String fileName = "war.war"; WebArchive archive = ShrinkWrap.create( WebArchive.class, fileName ); archive.addClasses( - org.hibernate.jpa.test.pack.war.ApplicationServer.class, - org.hibernate.jpa.test.pack.war.IncrementListener.class, - org.hibernate.jpa.test.pack.war.Lighter.class, - org.hibernate.jpa.test.pack.war.Money.class, - org.hibernate.jpa.test.pack.war.Mouse.class, - org.hibernate.jpa.test.pack.war.OtherIncrementListener.class, - org.hibernate.jpa.test.pack.war.Version.class + org.hibernate.orm.test.jpa.pack.war.ApplicationServer.class, + org.hibernate.orm.test.jpa.pack.war.IncrementListener.class, + org.hibernate.orm.test.jpa.pack.war.Lighter.class, + org.hibernate.orm.test.jpa.pack.war.Money.class, + org.hibernate.orm.test.jpa.pack.war.Mouse.class, + org.hibernate.orm.test.jpa.pack.war.OtherIncrementListener.class, + org.hibernate.orm.test.jpa.pack.war.Version.class ); ArchivePath path = ArchivePaths.create( "WEB-INF/classes/META-INF/orm.xml" ); @@ -415,8 +415,8 @@ public abstract class PackagingTestCase extends BaseSessionFactoryFunctionalTest path = ArchivePaths.create( "WEB-INF/classes/META-INF/persistence.xml" ); archive.addAsResource( "war/WEB-INF/classes/META-INF/persistence.xml", path ); - path = ArchivePaths.create( "WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml" ); - archive.addAsResource( "war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml", path ); + path = ArchivePaths.create( "WEB-INF/classes/org/hibernate/orm/test/jpa/pack/war/Mouse.hbm.xml" ); + archive.addAsResource( "war/WEB-INF/classes/org/hibernate/orm/test/jpa/pack/war/Mouse.hbm.xml", path ); File testPackage = new File( packageTargetDir, fileName ); archive.as( ZipExporter.class ).exportTo( testPackage, true ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java index 2946c4449f..fd8d55f634 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScannerTest.java @@ -25,8 +25,8 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.hibernate.jpa.boot.internal.StandardJpaScanEnvironmentImpl; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; -import org.hibernate.jpa.test.pack.defaultpar.ApplicationServer; -import org.hibernate.jpa.test.pack.defaultpar.Version; +import org.hibernate.orm.test.jpa.pack.defaultpar.ApplicationServer; +import org.hibernate.orm.test.jpa.pack.defaultpar.Version; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java index cb9d8a4c8f..0e10ca9352 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AbstractSqlFunctionMetadataBuilderContributorTest.java @@ -13,7 +13,7 @@ import jakarta.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.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java index 6d8d018da8..56e8d45b73 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/spi/metadatabuildercontributor/AttributeConverterMetadataBuilderContributorTest.java @@ -18,7 +18,7 @@ import org.hibernate.annotations.NaturalId; import org.hibernate.boot.spi.MetadataBuilderContributor; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java index 7e5539f80f..d46849d87d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyOneToManyWithEqualsImplementationTest.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.bytecode.enhancement.lazy; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java index c5968e18bb..55d9a7c875 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadUninitializedCollectionTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java index 15dcc96196..9edf25de5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadingLazyCollectionAfterQueryExecutionWithFlushModeAlwaysTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.OneToOne; import org.hibernate.FlushMode; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java index bbc9c59347..4dd0926c22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java @@ -43,7 +43,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java index 00d34f368b..274edc2053 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/QueryTest.java @@ -48,7 +48,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.After; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java index 3432630b31..9071b4270c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/comments/UseSqlCommentTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java index 786f9b92a0..2942f3231d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/proxy/ComponentBasicProxyTest.java @@ -16,7 +16,7 @@ import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.mapping.PersistentClass; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java index a7aba0c29d..6e99029809 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/BeforeCompletionReleaseTest.java @@ -27,7 +27,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.connections.internal.UserSuppliedConnectionProviderImpl; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java index 97a4eca6e1..065dcb154a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java @@ -8,15 +8,13 @@ package org.hibernate.orm.test.dialect; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2zDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java index 06a1f63c70..f0a077a917 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HSQLTruncFunctionTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java index 976b85be56..d29502cb97 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectPaginationTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Id; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java index e255345766..0564a983fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationMariaDBTest.java @@ -22,8 +22,8 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.dialect.MariaDB103Dialect; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java index f236d8df34..980d946394 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SequenceInformationTest.java @@ -20,7 +20,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.schema.TargetType; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java index d5bbd0045b..758b270e9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/mappedbyid/LoadGraphFindByIdTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java index d55ba746dc..b741b01161 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/parser/AbstractEntityGraphTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Subgraph; import org.hibernate.graph.GraphParser; import org.hibernate.graph.spi.RootGraphImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java index dfb03f364b..e5e7640c18 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/NonActiveTransactionSessionFindJdbcExceptionHandlingTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.PersistenceException; import org.hibernate.JDBCException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java index 0254bc7b2e..b0d8b74a7d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/proxy/ProxyPreservingFiltersOutsideInitialSessionTest.java @@ -11,7 +11,7 @@ import java.util.Map; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java index 612badb97b..2879adb41a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/graph/AbstractEntityGraphTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Subgraph; import org.hibernate.graph.GraphParser; import org.hibernate.graph.spi.RootGraphImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java similarity index 78% rename from hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java index 98cd6180f0..df2a83a84f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CoalesceTest.java @@ -4,20 +4,17 @@ * 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.test.hql; +package org.hibernate.orm.test.hql; import java.util.List; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; +import javax.persistence.TypedQuery; -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.dialect.PostgreSQL81Dialect; -import org.hibernate.query.Query; +import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; @@ -56,21 +53,19 @@ public class CoalesceTest extends BaseCoreFunctionalTestCase { @Test public void HHH_10463_TestCoalesce() { doInHibernate( this::sessionFactory, session -> { - Query query = session.createQuery( "from Person p where p.name = coalesce(:name , p.name) "); + TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(:name , p.name) ", Person.class ); query.setParameter("name", "Johannes"); List resultList = query.getResultList(); assertThat(resultList, hasItem(person)); } ); } - + @Test - @SkipForDialect( jiraKey = "HHH-10463", value = PostgreSQL81Dialect.class) - @SkipForDialect( jiraKey = "HHH-10463", value = Oracle8iDialect.class) - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") + @SkipForDialect(jiraKey = "HHH-10463", value = PostgreSQLDialect.class) public void HHH_10463_NullInCoalesce() { doInHibernate( this::sessionFactory, session -> { - Query query = session.createQuery("from Person p where p.name = coalesce(:name, p.name) "); + TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(:name, p.name) ", Person.class ); query.setParameter("name", null); List resultList = query.getResultList(); assertThat(resultList, hasItem(person)); @@ -78,16 +73,15 @@ public class CoalesceTest extends BaseCoreFunctionalTestCase { } @Test - @RequiresDialect( PostgreSQL81Dialect.class ) public void HHH_10463_NullInCoalesce_PostgreSQL_Workaround() { doInHibernate( this::sessionFactory, session -> { - Query query = session.createQuery("from Person p where p.name = coalesce(cast( :name as string) , p.name) "); + TypedQuery query = session.createQuery( "from Person p where p.name = coalesce(cast( :name as string) , p.name) ", Person.class ); query.setParameter("name", null); List resultList = query.getResultList(); assertThat(resultList, hasItem(person)); } ); } - + @Entity(name = "Person") public static class Person { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java index 9b9b55e3e0..c056c23fb9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/IdClassManyToOneCascadeTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Id; import jakarta.persistence.IdClass; import jakarta.persistence.ManyToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java index 8342ed7e7f..4c6c858e5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/generator/UUID2GeneratorStringUniqueIdentifierIdTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java index 682fd5b648..f8d6bd7ea5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/IdentityInsertSoleColumnTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import org.hibernate.dialect.AbstractHANADialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.DialectChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/sqm/HqlTranslationNoFactoryTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/sqm/HqlTranslationNoFactoryTests.java index 4d8d4a18e2..6afea46b4e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/intg/sqm/HqlTranslationNoFactoryTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/intg/sqm/HqlTranslationNoFactoryTests.java @@ -14,7 +14,7 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.jpa.JpaComplianceStub; +import org.hibernate.orm.test.jpa.JpaComplianceStub; import org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting; import org.hibernate.metamodel.model.domain.JpaMetamodel; import org.hibernate.metamodel.model.domain.internal.JpaMetamodelImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.java index d207b06437..ef62755402 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/BaseEntityManagerFunctionalTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/BaseEntityManagerFunctionalTestCase.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; +package org.hibernate.orm.test.jpa; import java.net.URL; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java index 60900081d1..6f59e17add 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Cat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Cat.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.io.Serializable; import java.util.ArrayList; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java index c7e3d92067..93c765f61a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Distributor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Distributor.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.io.Serializable; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java index 1e52afabad..345ec52de3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerClosedTest.java @@ -17,8 +17,6 @@ import jakarta.persistence.Parameter; import jakarta.persistence.Query; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; - import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java index 98a210071c..b313d73c68 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerFactoryClosedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryClosedTest.java @@ -7,7 +7,7 @@ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.util.Map; import jakarta.persistence.EntityManagerFactory; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.java index 114f3b0c1a..ab7a930e1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerTest.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; +package org.hibernate.orm.test.jpa; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java index 137eb051b4..e519b2a54b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Item.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/JpaComplianceStub.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/JpaComplianceStub.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java index 2776dd9a2e..73cd63a1ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/JpaComplianceStub.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaComplianceStub.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.jpa; +package org.hibernate.orm.test.jpa; import org.hibernate.jpa.spi.JpaCompliance; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java index 1a750aa89d..26f3ddfff2 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Kitten.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Kitten.java @@ -6,7 +6,7 @@ */ // $Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java index 10691276ec..54cbc432ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/LastUpdateListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/LastUpdateListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.util.Date; import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/MyNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/MyNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.java index 889d7b03e1..2b088bfe0f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/MyNamingStrategy.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/MyNamingStrategy.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; +package org.hibernate.orm.test.jpa; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java index b4a9400f40..6a155b1ab9 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/NamedQueryTransactionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NamedQueryTransactionFailureTest.java @@ -7,7 +7,7 @@ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.util.Map; import jakarta.persistence.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/NoOpListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/NoOpListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java index 5f7ced7e97..199e320e26 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/NoOpListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NoOpListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import org.hibernate.event.spi.PreInsertEvent; import org.hibernate.event.spi.PreInsertEventListener; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/NotSerializableClass.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/NotSerializableClass.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java index e71f9aa786..c32a972e75 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/NotSerializableClass.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/NotSerializableClass.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; /** * Attempts to serialize this class should cause a NotSerializableException error to be thrown. diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/SettingsGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/SettingsGenerator.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.java index e31863617b..976da4231b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/SettingsGenerator.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/SettingsGenerator.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; +package org.hibernate.orm.test.jpa; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/TestHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/TestHelper.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.java index 97c17e8f0a..8a13662ada 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/TestHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestHelper.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.jpa.test; +package org.hibernate.orm.test.jpa; -import java.io.File; import java.net.MalformedURLException; import java.net.URL; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java similarity index 97% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.java index 2bf3957258..80379a1ab5 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/TestingEntityManagerFactoryGenerator.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/TestingEntityManagerFactoryGenerator.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; +package org.hibernate.orm.test.jpa; import jakarta.persistence.EntityManagerFactory; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java similarity index 96% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java index c27a5f5ab9..296fd15d86 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/Wallet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/Wallet.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test; +package org.hibernate.orm.test.jpa; import java.io.Serializable; import java.util.Date; import jakarta.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java index c6a3e1fbf2..8973275ebf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbackAndDirtyTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManager; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java index 8748ecc1de..3443eaa6ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksDisabledTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa.callbacks; import java.util.Date; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.Cat; -import org.hibernate.jpa.test.Kitten; +import org.hibernate.orm.test.jpa.Cat; +import org.hibernate.orm.test.jpa.Kitten; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java index 06ddc1704a..98fcfdddf8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/CallbacksTest.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hibernate.jpa.test.Cat; -import org.hibernate.jpa.test.Kitten; +import org.hibernate.orm.test.jpa.Cat; +import org.hibernate.orm.test.jpa.Kitten; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java index dcd0aa56bd..5baea8e452 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/callbacks/PreUpdateBytecodeEnhancementTest.java @@ -6,7 +6,6 @@ */ package org.hibernate.orm.test.jpa.callbacks; -import java.nio.ByteBuffer; import java.time.Instant; import java.util.List; import java.util.Map; @@ -21,7 +20,7 @@ import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java index 407ee422ad..d32a70ef94 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/connection/DataSourceInjectionTest.java @@ -25,8 +25,8 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.jpa.HibernatePersistenceProvider; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; import org.hibernate.orm.test.jpa.xml.Light; import org.hibernate.orm.test.jpa.xml.Lighter; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java index 4053ad16fd..06830d5949 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaCompilingTest.java @@ -23,7 +23,7 @@ import org.hibernate.CacheMode; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.orm.test.jpa.callbacks.RemoteControl; import org.hibernate.orm.test.jpa.callbacks.Television; import org.hibernate.orm.test.jpa.callbacks.VideoSystem; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java index 78b1e2017a..6c19fe32f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/CriteriaQueryTypeQueryAdapterTest.java @@ -29,10 +29,9 @@ import jakarta.persistence.criteria.ParameterExpression; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.spi.QueryImplementor; import org.hibernate.testing.TestForIssue; -import org.hibernate.type.StringType; import org.junit.Test; public class CriteriaQueryTypeQueryAdapterTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java index 66596b6384..cc28654a84 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/EntitySuperclassCollectionTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java index bc82169797..9545367118 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ParameterTest.java @@ -19,7 +19,7 @@ import java.util.Arrays; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java index 64ce5e97f9..718c90694b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/QueryBuilderTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.SetJoin; import jakarta.persistence.metamodel.EntityType; import org.hibernate.dialect.CockroachDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.jpa.test.metamodel.Address; import org.hibernate.jpa.test.metamodel.Alias; import org.hibernate.jpa.test.metamodel.Country; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java index 72677467a8..bff3bf4c41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/SuperclassCollectionTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java index 8ffb667588..b247d58282 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatJoinTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java index 3ec611d65b..2afc87a7ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatKeywordTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import jakarta.persistence.metamodel.EntityType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.jpa.test.metamodel.Thing; import org.hibernate.jpa.test.metamodel.ThingWithQuantity; import org.hibernate.jpa.test.metamodel.ThingWithQuantity_; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java index 9d4e4e05e3..1b63ccaa85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/TreatListJoinTest.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java index 55be83866a..4761a91d20 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/alias/CriteriaMultiselectAliasTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; import org.hibernate.transform.Transformers; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java index e5cba4ce3e..4ee3ba7a47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/BasicCriteriaUsageTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import jakarta.persistence.metamodel.SingularAttribute; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Ignore; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java index 6dd04337dc..1b46ca196a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/ConcatTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.Root; import java.io.Serializable; import java.util.List; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java index 5b2d1ae607..5e0f2cd99c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/enumcollection/EnumIsMemberTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java index 23232cf360..bbd32acf36 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/fetchscroll/CriteriaToScrollableResultsFetchTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.query.Query; import org.hibernate.ScrollableResults; import org.hibernate.dialect.AbstractHANADialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java index 0e0ea19a61..9e5c9c8723 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/literal/AbstractCriteriaLiteralHandlingModeTest.java @@ -11,11 +11,10 @@ import java.util.Map; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Tuple; -import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.criteria.HibernateCriteriaBuilder; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java index def715b089..324ea612bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinEntryTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.MapJoin; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java index 7f32303b56..54e5739be4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/mapjoin/MapJoinTestWithEmbeddable.java @@ -27,7 +27,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.MapJoin; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java index 851a3ac667..cfdbf51de3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralInSelectExpressionTest.java @@ -25,7 +25,7 @@ import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java index ea348c5694..def237963e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/CriteriaLiteralsTest.java @@ -25,8 +25,7 @@ import jakarta.persistence.criteria.Root; import org.hibernate.dialect.H2Dialect; import org.hibernate.exception.SQLGrammarException; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.query.SemanticException; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java index a3e87fda99..77488bd60d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/nulliteral/NullLiteralExpression.java @@ -10,7 +10,7 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaUpdate; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java index 4eff882bbe..aa4f429c5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/query/LimitExpressionTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.criteria.CriteriaQuery; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java index 70ff1411b5..dea447d939 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/GroupBySelectCaseTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.orm.test.jpa.metadata.Person_; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java index 112e33af3e..3ad680003b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseLiteralHandlingBindTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.criteria.ValueHandlingMode; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java index d03d1b9b43..647d14b242 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/selectcase/SelectCaseTest.java @@ -34,7 +34,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java index a3fab036b7..6fd332806a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/simplecase/BasicSimpleCaseTest.java @@ -27,7 +27,7 @@ import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java index 7b89549e74..c662a8c8b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/subquery/AbstractSubqueryInSelectClauseTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.Id; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Before; public abstract class AbstractSubqueryInSelectClauseTest extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java index 25884b4bfa..9f220843a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/DisableDiscardPersistenceContextOnCloseTest.java @@ -10,7 +10,7 @@ import java.sql.SQLException; import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.Wallet; +import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java index e533c01744..90a77c8c69 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EnableDiscardPersistenceContextOnCloseTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.ejb3configuration; import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.Wallet; +import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.testing.orm.junit.DialectFeatureChecks; import org.hibernate.testing.orm.junit.RequiresDialectFeature; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java index ea5916dc76..607e72abc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerFactorySerializationTest.java @@ -17,11 +17,11 @@ import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.Cat; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; -import org.hibernate.jpa.test.Kitten; -import org.hibernate.jpa.test.Wallet; +import org.hibernate.orm.test.jpa.Cat; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; +import org.hibernate.orm.test.jpa.Kitten; +import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java index 5db174943b..5c3e403eca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/EntityManagerSerializationTest.java @@ -8,7 +8,6 @@ package org.hibernate.orm.test.jpa.ejb3configuration; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; @@ -16,11 +15,11 @@ import java.util.Date; import jakarta.persistence.EntityManager; import org.hibernate.Session; -import org.hibernate.jpa.test.Cat; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; -import org.hibernate.jpa.test.Kitten; -import org.hibernate.jpa.test.Wallet; +import org.hibernate.orm.test.jpa.Cat; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; +import org.hibernate.orm.test.jpa.Kitten; +import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java index d1938865c5..61f1000857 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/InterceptorTest.java @@ -21,10 +21,10 @@ import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; import org.hibernate.cfg.Environment; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; -import org.hibernate.jpa.test.SettingsGenerator; +import org.hibernate.orm.test.jpa.SettingsGenerator; import org.hibernate.testing.orm.junit.DialectContext; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java index bd38c8d5ec..0e6d5a6b44 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NamingStrategyConfigurationTest.java @@ -12,7 +12,7 @@ import java.util.Collections; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.jpa.test.MyNamingStrategy; +import org.hibernate.orm.test.jpa.MyNamingStrategy; import org.hibernate.testing.orm.jpa.PersistenceUnitInfoAdapter; import org.hibernate.testing.orm.junit.BaseUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingValueProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingValueProvider.java index 35dfa3f286..7edb9035df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingValueProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/NotSerializableClassSettingValueProvider.java @@ -6,7 +6,7 @@ */ package org.hibernate.orm.test.jpa.ejb3configuration; -import org.hibernate.jpa.test.NotSerializableClass; +import org.hibernate.orm.test.jpa.NotSerializableClass; import org.hibernate.testing.orm.jpa.NonStringValueSettingProvider; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java index 7c66281a30..dddea236dc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java @@ -38,7 +38,7 @@ import org.hibernate.id.IdentifierGenerator; import org.hibernate.internal.FilterAliasGenerator; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; -import org.hibernate.jpa.test.SettingsGenerator; +import org.hibernate.orm.test.jpa.SettingsGenerator; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; import org.hibernate.metadata.ClassMetadata; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java index 30f1727bd9..533dc0bd1c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/enhancement/TestLazyPropertyOnPreUpdate.java @@ -8,7 +8,7 @@ package org.hibernate.orm.test.jpa.enhancement; import org.hibernate.Hibernate; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java index 3b1c592fd2..61af50538d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java @@ -21,7 +21,7 @@ import jakarta.persistence.NamedEntityGraph; import jakarta.persistence.Table; import org.hibernate.graph.GraphSemantic; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java index 1da461308a..af12d6bf0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphTest.java @@ -27,7 +27,7 @@ import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java index b7e397a4e4..cb25764bef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/LoadAndFetchGraphTest.java @@ -26,7 +26,7 @@ import org.hibernate.Hibernate; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.graph.GraphSemantic; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java index 89bde00f4c..724883c045 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/mappedbyid/FetchGraphFindByIdTest.java @@ -2,7 +2,7 @@ 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.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.orm.test.jpa.graphs.Company; import org.hibernate.orm.test.jpa.graphs.CompanyFetchProfile; import org.hibernate.orm.test.jpa.graphs.Course; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java index 8fd22c80cd..e18795b378 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/queryhint/QueryHintEntityGraphTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.Subgraph; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.orm.test.jpa.graphs.Company; import org.hibernate.orm.test.jpa.graphs.CompanyFetchProfile; import org.hibernate.orm.test.jpa.graphs.Course; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java similarity index 99% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.java index ee7db22f2f..b490e6cdd7 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/joinable/ManyToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/joinable/ManyToOneJoinTableTest.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.joinable; +package org.hibernate.orm.test.jpa.joinable; import java.io.Serializable; import java.util.Objects; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java index fb63006987..457b664916 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTest.java @@ -26,8 +26,7 @@ import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; - +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java index d8dbea8c8e..8d7de3af9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/LockTimeoutPropertyTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Query; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java index 6938803fb3..b3a506c1d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/NativeSQLQueryTimeoutTest.java @@ -9,7 +9,7 @@ package org.hibernate.orm.test.jpa.lock; import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java index de8f02d644..3dc1a30d33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java @@ -14,7 +14,7 @@ import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.internal.SessionImpl; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.NativeQuery; import org.hibernate.testing.DialectChecks; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java index 1d9108e6b9..8013d134e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/StatementIsClosedAfterALockExceptionTest.java @@ -13,7 +13,7 @@ import java.util.Map; import jakarta.persistence.LockModeType; import org.hibernate.Session; import org.hibernate.dialect.CockroachDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.orm.jdbc.PreparedStatementSpyConnectionProvider; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java index cfc7378ced..8a2ce5ddca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import jakarta.persistence.EntityManagerFactory; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; +import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.BaseUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java index 7ab13658fc..f9758394e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.embedded; import jakarta.persistence.EntityManagerFactory; import java.util.Arrays; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; +import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; +import org.hibernate.jpa.AvailableSettings; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.BaseUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java index 44a13b7347..f3f4e4107f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java @@ -9,8 +9,8 @@ package org.hibernate.orm.test.jpa.metagen.mappedsuperclass.idclass; import jakarta.persistence.EntityManagerFactory; import java.util.Arrays; +import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.BaseUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java index 5863b971ef..1761146ef4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metagen/mappedsuperclass/overridden/MappedSuperclassWithOverriddenAttributeTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import jakarta.persistence.EntityManagerFactory; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.TestingEntityManagerFactoryGenerator; +import org.hibernate.orm.test.jpa.TestingEntityManagerFactoryGenerator; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.BaseUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java index 1cc5cbe3f8..a3e050646a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java index 319ea8cf9c..224c25a985 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetoone/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.EntityManager; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java index 8cb4a50b65..4416766c88 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/cfgxmlpar/Morito.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.cfgxmlpar; +package org.hibernate.orm.test.jpa.pack.cfgxmlpar; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java index 9a34eb0917..3e2e5f0e64 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/ApplicationServer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java index a083947e72..2b0f09f7ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/IncrementListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; import jakarta.persistence.PrePersist; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Lighter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java index 6a124e2514..1ab48445f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Lighter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Lighter.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java index 2490d4336d..00e26c5051 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Money.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java index 4dc02590f9..e6a4f39183 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Mouse.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; import jakarta.persistence.ExcludeDefaultListeners; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/OtherIncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/OtherIncrementListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java index 7eefa0bc3a..3ca6656f75 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/OtherIncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/OtherIncrementListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java index 59ff56d240..8196476739 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/Version.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar; +package org.hibernate.orm.test.jpa.pack.defaultpar; import jakarta.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java index ff0ae950a4..ee4da9f9f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar/package-info.java @@ -5,6 +5,6 @@ * See the lgpl.txt file in the root directory or . */ @NamedQuery(name = "allMouse", - query = "select m from ApplicationServer m") package org.hibernate.jpa.test.pack.defaultpar; + query = "select m from ApplicationServer m") package org.hibernate.orm.test.jpa.pack.defaultpar; import org.hibernate.annotations.NamedQuery; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java index 3a3ca8f177..8a1f0d55aa 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/ApplicationServer1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/ApplicationServer1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java index 8c4cb4cbbc..dfb5e88100 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/IncrementListener1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/IncrementListener1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; import jakarta.persistence.PrePersist; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Lighter1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Lighter1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java index 0f80531b83..1c7be6c1ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Lighter1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Lighter1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java index 26933b2dc0..ce742d835f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Money1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Money1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java index 575c5453d8..e7bc7e9dcc 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Mouse1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; import jakarta.persistence.ExcludeDefaultListeners; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/OtherIncrementListener1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/OtherIncrementListener1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java index ee3b5ab0f8..24ac31518b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/OtherIncrementListener1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/OtherIncrementListener1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java index fac416624e..b90a571f71 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/Version1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/Version1.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; import jakarta.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java index 543da398ec..b252b1297f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/defaultpar_1_0/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/defaultpar_1_0/package-info.java @@ -6,5 +6,5 @@ */ @NamedQuery(name = "allMouse_1_0", query = "select m from ApplicationServer1 m") -package org.hibernate.jpa.test.pack.defaultpar_1_0; +package org.hibernate.orm.test.jpa.pack.defaultpar_1_0; import org.hibernate.annotations.NamedQuery; \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java index 00e1e2569b..9cb197cae6 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/excludehbmpar/Caipirinha.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.excludehbmpar; +package org.hibernate.orm.test.jpa.pack.excludehbmpar; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java index e2059dbdc5..e195080f2a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explicitpar/Washer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.explicitpar; +package org.hibernate.orm.test.jpa.pack.explicitpar; import jakarta.persistence.Entity; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java index 6a6be51b7b..384c411abe 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Carpet.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.explodedpar; +package org.hibernate.orm.test.jpa.pack.explodedpar; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Elephant.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Elephant.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java index ef052bfcfb..3646756f6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Elephant.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/Elephant.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.explodedpar; +package org.hibernate.orm.test.jpa.pack.explodedpar; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java similarity index 86% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java index f288b5485c..8c1a61f87f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/explodedpar/package-info.java @@ -4,5 +4,5 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -@NamedQuery(name = "allCarpet", query = "select c from Carpet c") package org.hibernate.jpa.test.pack.explodedpar; +@NamedQuery(name = "allCarpet", query = "select c from Carpet c") package org.hibernate.orm.test.jpa.pack.explodedpar; import org.hibernate.annotations.NamedQuery; \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java index f286dfb3cd..01021fb154 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/externaljar/Scooter.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.externaljar; +package org.hibernate.orm.test.jpa.pack.externaljar; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java index 11556ad45a..4a7a53b113 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/overridenpar/Bug.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.spacepar; +package org.hibernate.orm.test.jpa.pack.overridenpar; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java index 03b8fdebad..fc55d08c38 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/spacepar/Bug.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.overridenpar; +package org.hibernate.orm.test.jpa.pack.spacepar; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/various/Airplane.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/various/Airplane.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java index e0bdce7a31..5a44cb4119 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/various/Airplane.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Airplane.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.various; +package org.hibernate.orm.test.jpa.pack.various; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/various/Seat.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java similarity index 90% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/various/Seat.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java index c9dfd2b884..a9f493c876 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/various/Seat.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/various/Seat.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.various; +package org.hibernate.orm.test.jpa.pack.various; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java index f42e1d399a..16e192f42a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/ApplicationServer.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java index 173736b50e..c626fce596 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/IncrementListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; import jakarta.persistence.PrePersist; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Lighter.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Lighter.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java index f159aad1a4..348dd07675 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Lighter.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Lighter.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java index 8bfb9d7ca5..89bf50770c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Money.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Money.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java similarity index 93% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java index b337c27bcd..ba767b4644 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Mouse.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; import jakarta.persistence.ExcludeDefaultListeners; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/OtherIncrementListener.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java similarity index 92% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/OtherIncrementListener.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java index db9adcd313..bb456838c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/OtherIncrementListener.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/OtherIncrementListener.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java index cf52d2d1ed..9d204bd94c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/Version.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/Version.java @@ -6,7 +6,7 @@ */ //$Id$ -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; import jakarta.persistence.Embeddable; /** diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java similarity index 88% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java index 19247a4d39..148803e585 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/pack/war/package-info.java @@ -6,5 +6,5 @@ */ @NamedQuery(name = "allMouse", query = "select m from ApplicationServer m") -package org.hibernate.jpa.test.pack.war; +package org.hibernate.orm.test.jpa.pack.war; import org.hibernate.annotations.NamedQuery; \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.java index c9ceb1ec5f..16ad006d8e 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DataPoint.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DataPoint.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.persistenceunit; +package org.hibernate.orm.test.jpa.persistenceunit; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DuplicatePersistenceUnitNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DuplicatePersistenceUnitNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.java index f75c0b0466..280f657fc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/DuplicatePersistenceUnitNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/DuplicatePersistenceUnitNameTest.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.persistenceunit; +package org.hibernate.orm.test.jpa.persistenceunit; import java.io.IOException; import java.net.URL; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/ExcludeUnlistedClassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/ExcludeUnlistedClassesTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.java index 034bb8a5b2..455e94a9ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/ExcludeUnlistedClassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/ExcludeUnlistedClassesTest.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.persistenceunit; +package org.hibernate.orm.test.jpa.persistenceunit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java index 13ef0a2e53..7631e3bf8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/TwoPersistenceUnits2LCDisabledEnabled.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.persistenceunit; +package org.hibernate.orm.test.jpa.persistenceunit; import java.util.Collections; import java.util.Map; @@ -18,7 +18,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.java index 56529d8feb..abc9e6aaed 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/persistenceunit/UnlistedDataPoint.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/persistenceunit/UnlistedDataPoint.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.persistenceunit; +package org.hibernate.orm.test.jpa.persistenceunit; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java similarity index 95% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.java index dfe0b70df0..1ee68a9489 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/CachedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/CachedQueryTest.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; @@ -13,9 +13,10 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.jpa.HibernateEntityManagerFactory; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; +import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.junit.Test; @@ -32,6 +33,8 @@ import static org.junit.Assert.assertEquals; public class CachedQueryTest extends BaseEntityManagerFunctionalTestCase { @Test + // todo (6.0): implement shallow query cache structure + @FailureExpected(jiraKey = "", message = "Different query cache structure") public void testCacheableQuery() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java index f411d2d8bf..50b69f325f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ConstructorResultNativeQueryTest.java @@ -27,7 +27,7 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import org.hibernate.dialect.OracleDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.SkipForDialect; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java index 3020dc6595..38c18cc9af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Contractor.java @@ -9,8 +9,6 @@ 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/orm/test/jpa/query/DateTimeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java index 0b86aa5129..e3a523d003 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/DateTimeParameterTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Table; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Employee.java similarity index 98% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/Employee.java index 1fdf6ec138..d1a294e0ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/Employee.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/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.query; +package org.hibernate.orm.test.jpa.query; import java.io.Serializable; import jakarta.persistence.DiscriminatorColumn; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java index a1598661de..fa2bea3276 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/LimitExpressionTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Query; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java index 2bef09e08a..d477b79da7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryCommentTest.java @@ -22,7 +22,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java index 83474bafc2..e5125f711f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedQueryTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.Query; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.NativeQuery; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java index ccd7b849ef..19f5f5ce52 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryOrdinalParametersTest.java @@ -18,9 +18,8 @@ import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import org.hibernate.Session; -import org.hibernate.dialect.CockroachDialect; import org.hibernate.dialect.PostgreSQL82Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.NativeQuery; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java index 2a2307865b..e062cf67c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryResultTypeAutoDiscoveryTest.java @@ -31,11 +31,17 @@ import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.Nationalized; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; +import org.hibernate.dialect.AbstractTransactSQLDialect; +import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.DerbyDialect; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.MySQLDialect; +import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; +import org.hibernate.dialect.SybaseDialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.jpa.boot.spi.Bootstrap; @@ -91,56 +97,75 @@ public class NativeQueryResultTypeAutoDiscoveryTest { @Test public void commonNumericTypes() { createEntityManagerFactory( - BooleanEntity.class, BigintEntity.class, IntegerEntity.class, SmallintEntity.class, - DoubleEntity.class, - NumericEntity.class + DoubleEntity.class ); - doTest( BooleanEntity.class, true ); doTest( BigintEntity.class, 9223372036854775807L ); doTest( IntegerEntity.class, 2147483647 ); doTest( SmallintEntity.class, (short)32767 ); doTest( DoubleEntity.class, 445146115151.45845 ); - doTest( NumericEntity.class, new BigDecimal( "5464384284258458485484848458.48465843584584684" ) ); } @Test + @SkipForDialect(value = SybaseDialect.class, comment = "No support for the bit datatype so we use tinyint") + public void booleanType() { + createEntityManagerFactory( BooleanEntity.class ); + doTest( BooleanEntity.class, true ); + } + + @Test + @SkipForDialect(value = SybaseDialect.class, comment = "No support for the bit datatype so we use tinyint") public void bitType() { createEntityManagerFactory( BitEntity.class ); doTest( BitEntity.class, false ); } @Test - // Postgresql turns tinyints into shorts in resultsets, and advertises the type as short in the metadata. - // Not much we can do about that. - @SkipForDialect(PostgreSQLDialect.class) + @SkipForDialect(value = PostgreSQLDialect.class, comment = "Turns tinyints into shorts in result sets and advertises the type as short in the metadata") + @SkipForDialect(value = DerbyDialect.class, comment = "No support for the tinyint datatype so we use smallint") + @SkipForDialect(value = DB2Dialect.class, comment = "No support for the tinyint datatype so we use smallint") + @SkipForDialect(value = AbstractTransactSQLDialect.class, comment = "No support for the tinyint datatype so we use smallint") public void tinyintType() { createEntityManagerFactory( TinyintEntity.class ); doTest( TinyintEntity.class, (byte)127 ); } @Test - // H2 turns floats into doubles in resultsets, and advertises the type as double in the metadata. - // Not much we can do about that. - @SkipForDialect(H2Dialect.class) + @SkipForDialect(value = H2Dialect.class, comment = "Turns floats into doubles in result sets and advertises the type as double in the metadata") + @SkipForDialect(value = HSQLDialect.class, comment = "Turns floats into doubles in result sets and advertises the type as double in the metadata") public void floatType() { createEntityManagerFactory( FloatEntity.class ); doTest( FloatEntity.class, 15516.125f ); } @Test - // MariaDB/MySQL turn reals into doubles in resultsets, and advertise the type as double in the metadata. - // Not much we can do about that. - @SkipForDialect(MySQLDialect.class) + @SkipForDialect(value = MySQLDialect.class, comment = "Turns reals into doubles in result sets and advertises the type as double in the metadata") + @SkipForDialect(value = HSQLDialect.class, comment = "Turns reals into doubles in result sets and advertises the type as double in the metadata") public void realType() { createEntityManagerFactory( RealEntity.class ); doTest( RealEntity.class, 15516.125f ); } @Test + @SkipForDialect(value = DerbyDialect.class, comment = "Value is too big for the maximum allowed precision of Derby") + @SkipForDialect(value = DB2Dialect.class, comment = "Value is too big for the maximum allowed precision of DB2") + @SkipForDialect(value = OracleDialect.class, comment = "Value is too big for the maximum allowed precision of Oracle") + @SkipForDialect(value = AbstractTransactSQLDialect.class, comment = "Value is too big for the maximum allowed precision of SQL Server and Sybase") + public void numericType() { + createEntityManagerFactory( + NumericEntity.class + ); + doTest( NumericEntity.class, new BigDecimal( "5464384284258458485484848458.48465843584584684" ) ); + } + + @Test + @SkipForDialect(value = DerbyDialect.class, comment = "Value is too big for the maximum allowed precision of Derby") + @SkipForDialect(value = DB2Dialect.class, comment = "Value is too big for the maximum allowed precision of DB2") + @SkipForDialect(value = OracleDialect.class, comment = "Value is too big for the maximum allowed precision of Oracle") + @SkipForDialect(value = AbstractTransactSQLDialect.class, comment = "Value is too big for the maximum allowed precision of SQL Server and Sybase") public void decimalType() { createEntityManagerFactory( DecimalEntity.class ); doTest( DecimalEntity.class, new BigDecimal( "5464384284258458485484848458.48465843584584684" ) ); @@ -150,20 +175,26 @@ public class NativeQueryResultTypeAutoDiscoveryTest { public void commonTextTypes() { createEntityManagerFactory( VarcharEntity.class, - NvarcharEntity.class, - CharEntity.class, - LongvarcharEntity.class + NvarcharEntity.class ); doTest( VarcharEntity.class, "some text" ); doTest( NvarcharEntity.class, "some text" ); + } + + @Test + @SkipForDialect(value = OracleDialect.class, comment = "Oracle maps LONGVARCHAR to CLOB") + @SkipForDialect(value = DB2Dialect.class, comment = "DB2 maps LONGVARCHAR to CLOB") + @SkipForDialect(value = SybaseDialect.class, comment = "Sybase maps LONGVARCHAR to CLOB") + public void longCharType() { + createEntityManagerFactory( + LongvarcharEntity.class + ); + doTest( LongvarcharEntity.class, "some text" ); } @Test - // MariaDB/MySQL give a precision of 3 for the column corresponding to the CHAR(1) (go figure), - // leading to Hibernate interpreting the type as String. - @SkipForDialect(MySQLDialect.class) public void charType() { createEntityManagerFactory( CharEntity.class ); doTest( CharEntity.class, 'c' ); @@ -181,12 +212,22 @@ public class NativeQueryResultTypeAutoDiscoveryTest { public void binaryTypes() { createEntityManagerFactory( BinaryEntity.class, - VarbinaryEntity.class, - LongvarbinaryEntity.class + VarbinaryEntity.class ); doTest( BinaryEntity.class, "some text".getBytes() ); doTest( VarbinaryEntity.class, "some text".getBytes() ); + } + + @Test + @SkipForDialect(value = OracleDialect.class, comment = "Oracle maps LONGVARBINARY to BLOB") + @SkipForDialect(value = DB2Dialect.class, comment = "DB2 maps LONGVARBINARY to BLOB") + @SkipForDialect(value = SybaseDialect.class, comment = "Sybase maps LONGVARBINARY to BLOB") + public void longBinaryType() { + createEntityManagerFactory( + LongvarbinaryEntity.class + ); + doTest( LongvarbinaryEntity.class, "some text".getBytes() ); } @@ -212,11 +253,11 @@ public class NativeQueryResultTypeAutoDiscoveryTest { } @Test + @SkipForDialect(value = OracleDialect.class, comment = "Oracle maps DATE and TIME to TIMESTAMP") public void dateTimeTypes() { createEntityManagerFactory( DateEntity.class, - TimeEntity.class, - TimestampEntity.class + TimeEntity.class ); ZonedDateTime zonedDateTime = ZonedDateTime.of( @@ -227,6 +268,20 @@ public class NativeQueryResultTypeAutoDiscoveryTest { doTest( DateEntity.class, new java.sql.Date( zonedDateTime.toInstant().toEpochMilli() ) ); doTest( TimeEntity.class, new Time( zonedDateTime.toLocalTime().toNanoOfDay() / 1000 ) ); + } + + @Test + public void timestampType() { + createEntityManagerFactory( + TimestampEntity.class + ); + + ZonedDateTime zonedDateTime = ZonedDateTime.of( + 2014, Month.NOVEMBER.getValue(), 15, + 18, 0, 0, 0, + ZoneId.of( "UTC" ) + ); + doTest( TimestampEntity.class, new Timestamp( zonedDateTime.toInstant().toEpochMilli() ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java index 72fff0a306..0daa468b65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NullParameterQueryTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java index 90e96b1e7e..25c2cf6dd7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/OracleConstructorResultNativeQueryTest.java @@ -24,7 +24,7 @@ import jakarta.persistence.TemporalType; import org.junit.Test; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java index 400b76407c..c59a920a28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryParametersValidationTest.java @@ -25,7 +25,7 @@ import org.hibernate.SessionFactory; import org.hibernate.annotations.Type; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.usertype.UserType; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java index 345eb16d85..2b1a46ea70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryTest.java @@ -26,16 +26,13 @@ import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.CockroachDialect; -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.engine.spi.SessionFactoryImplementor; -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.orm.test.jpa.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; +import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.stat.Statistics; import org.hibernate.testing.SkipForDialect; @@ -136,7 +133,6 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testNullPositionalParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -166,7 +162,6 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testNullPositionalParameterParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -213,7 +208,6 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testNullPositionalParameterParameterIncompatible() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -260,7 +254,6 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testNullNamedParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -290,7 +283,6 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testNullNamedParameterParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -336,7 +328,6 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testNullNamedParameterParameterIncompatible() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -382,11 +373,9 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = OracleDialect.class, jiraKey = "HHH-10161", comment = "Cannot convert untyped null (assumed to be BINARY type) to NUMBER") - @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to INTEGER") + @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") public void testNativeQueryNullPositionalParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -419,11 +408,9 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { @Test @TestForIssue(jiraKey = "HHH-10161") - @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = OracleDialect.class, comment = "ORA-00932: inconsistent datatypes: expected NUMBER got BINARY") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to INTEGER") + @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") public void testNativeQueryNullPositionalParameterParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -472,11 +459,9 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { } @Test - @SkipForDialect(value = OracleDialect.class, jiraKey = "HHH-10161", comment = "Cannot convert untyped null (assumed to be BINARY type) to NUMBER") - @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to INTEGER") + @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") public void testNativeQueryNullNamedParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); @@ -509,11 +494,9 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase { @Test @TestForIssue(jiraKey = "HHH-10161") - @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = OracleDialect.class, comment = "ORA-00932: inconsistent datatypes: expected NUMBER got BINARY") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to INTEGER") + @SkipForDialect(value = PostgreSQLDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") + @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot determine the parameter types and bind type is unknown because the value is null") public void testNativeQueryNullNamedParameterParameter() throws Exception { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java index dc8991c3c8..ded488c847 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/QueryWithLiteralsInSelectExpressionTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Table; import java.io.Serializable; import java.util.List; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java index 6518b012fc..39c255ac7c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/ScalarResultNativeQueryTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.SqlResultSetMapping; import jakarta.persistence.Table; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java index 57cfe29ece..33ffe493b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/TupleNativeQueryTest.java @@ -1,7 +1,7 @@ package org.hibernate.orm.test.jpa.query; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.sql.internal.NativeQueryImpl; import org.hibernate.query.sql.spi.NativeQueryImplementor; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java index ab6331623b..547a28b918 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/SchemaCreateDropUtf8WithoutHbm2DdlCharsetNameTest.java @@ -21,7 +21,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.EntityManagerFactoryBuilder; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.jupiter.api.AfterEach; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java index 90e8ba7870..09e0a4b9a8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest.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.schemagen.iso8859; +package org.hibernate.orm.test.jpa.schemagen.iso8859; import java.util.Map; @@ -22,8 +22,9 @@ import org.hibernate.testing.TestForIssue; @TestForIssue( jiraKey = "HHH-10972" ) public class JpaFileSchemaGeneratorWithHbm2DdlCharsetNameTest extends JpaSchemaGeneratorTest { + @Override public String getScriptFolderPath() { - return "org/hibernate/jpa/test/schemagen/iso8859/"; + return super.getScriptFolderPath() + "iso8859/"; } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java similarity index 87% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java index a594996dc5..685ec766b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithHbm2DdlCharsetNameTest.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.schemagen.iso8859; +package org.hibernate.orm.test.jpa.schemagen.iso8859; import java.util.Map; @@ -21,8 +21,9 @@ import org.hibernate.testing.RequiresDialect; public class JpaSchemaGeneratorWithHbm2DdlCharsetNameTest extends JpaSchemaGeneratorTest { + @Override public String getScriptFolderPath() { - return "org/hibernate/jpa/test/schemagen/iso8859/"; + return super.getScriptFolderPath() + "iso8859/"; } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java similarity index 85% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java index 14edd9c8cc..8d51762247 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest.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.schemagen.iso8859; +package org.hibernate.orm.test.jpa.schemagen.iso8859; import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.jpa.schemagen.JpaSchemaGeneratorTest; @@ -18,8 +18,9 @@ import org.hibernate.testing.RequiresDialect; public class JpaSchemaGeneratorWithoutHbm2DdlCharsetNameTest extends JpaSchemaGeneratorTest { + @Override public String getScriptFolderPath() { - return "org/hibernate/jpa/test/schemagen/iso8859/"; + return super.getScriptFolderPath() + "iso8859/"; } protected String encodedName() { diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java similarity index 94% rename from hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java index 30def953bf..14d44de76c 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/schemagen/iso8859/SchemaCreateDropWithHbm2DdlCharsetNameTest.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.schemagen.iso8859; +package org.hibernate.orm.test.jpa.schemagen.iso8859; import java.util.Map; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java index 3746e62a61..ffb26cbc63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/secondarytable/AbstractNonOptionalSecondaryTableTest.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.runners.Parameterized; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java similarity index 91% rename from hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java index 535dd6135c..9af8c8d4df 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/spi/NativeQueryTupleTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/spi/NativeQueryTupleTransformerTest.java @@ -1,10 +1,12 @@ -package org.hibernate.jpa.spi; +package org.hibernate.orm.test.jpa.spi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import jakarta.persistence.Tuple; +import org.hibernate.jpa.spi.NativeQueryTupleTransformer; + import org.junit.Test; /** diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java index 4f86432640..ce6be09076 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/test/components/ComponentCriteriaTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.Hibernate; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java index 0c940bb98c..1df35e9f5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java @@ -19,7 +19,7 @@ import jakarta.persistence.TransactionRequiredException; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.HibernateEntityManagerFactory; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java index bda6d88e8e..8d67790a3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/TransactionCommitFailureTest.java @@ -21,7 +21,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.testing.orm.jpa.PersistenceUnitDescriptorAdapter; -import org.hibernate.jpa.test.SettingsGenerator; +import org.hibernate.orm.test.jpa.SettingsGenerator; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.BaseUnitTest; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java index 2a5f54ea33..d7d1dbda2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/GetIdentifierTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.EntityManager; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.proxy.HibernateProxy; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java index d39288c22f..b5015a98bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/IsLoadedTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.EntityManager; import org.junit.Test; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java index 2a16e0327c..053afa4200 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/userguide/util/ProviderUtilTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Persistence; import jakarta.persistence.spi.LoadState; import org.hibernate.jpa.internal.util.PersistenceUtilHelper; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java index d4fabf34ff..1bc0ba93f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/versions/JpaXsdVersionsTest.java @@ -23,8 +23,8 @@ import javax.sql.DataSource; import org.hibernate.AnnotationException; import org.hibernate.InvalidMappingException; import org.hibernate.jpa.HibernatePersistenceProvider; -import org.hibernate.jpa.test.pack.defaultpar.Lighter; -import org.hibernate.jpa.test.pack.defaultpar_1_0.Lighter1; +import org.hibernate.orm.test.jpa.pack.defaultpar.Lighter; +import org.hibernate.orm.test.jpa.pack.defaultpar_1_0.Lighter1; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java index 6aa5c72f4a..813c20ab92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/ConverterTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.SessionFactory; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.metamodel.model.domain.AllowableParameterType; import org.hibernate.metamodel.spi.MetamodelImplementor; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java index 06720c7c77..2c2146e59a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/OraclePaginationTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.dialect.OracleDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java index baf88ccf85..3d3c4d47b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/AddNamedQueryTest.java @@ -15,9 +15,9 @@ import org.hibernate.FlushMode; import org.hibernate.LockMode; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.jpa.QueryHints; -import org.hibernate.jpa.test.Distributor; -import org.hibernate.jpa.test.Item; -import org.hibernate.jpa.test.Wallet; +import org.hibernate.orm.test.jpa.Distributor; +import org.hibernate.orm.test.jpa.Item; +import org.hibernate.orm.test.jpa.Wallet; import org.hibernate.query.hql.spi.NamedHqlQueryMemento; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java index 3e469c11b0..d498ab34b6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java index 5428b1eb46..65c550d097 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh11877/HHH111877Test.java @@ -5,7 +5,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java index b4c9464d08..b7853c7c92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13058/HHH13058Test.java @@ -11,7 +11,7 @@ import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Subquery; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java index 5284fd30a0..961fd26dc1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13908/HHH13908Test.java @@ -5,7 +5,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java index 6c77c8c420..481b316996 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh14197/HHH14197Test.java @@ -7,7 +7,7 @@ import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.SetJoin; import jakarta.persistence.criteria.Subquery; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java index d62d6cb2b9..14f1971eea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jdbc/autocommit/AbstractSkipAutoCommitTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import javax.sql.DataSource; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java index b47de93851..7d0a681802 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaMigratorHaltOnErrorTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DerbyDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.SkipForDialect; import org.hibernate.tool.schema.spi.SchemaManagementException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java index 6a8dab2c2d..3fb49dea38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/SchemaUpdateProceedOnErrorTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java index 4d4d5664ef..021506d637 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.SemanticException; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java index 2bc7f4e843..a65f144fad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypeContributorTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.boot.spi.MetadataBuilderContributor; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.Query; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java index eb7f0bbc5c..98cf24550e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/contributor/ArrayTypePropertiesTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Id; import org.hibernate.annotations.TypeDef; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.Query; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java index c7a53e0a5a..f888fefee3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/UnidirectionalOneToManyNonPkJoinColumnTest.java @@ -7,7 +7,6 @@ package org.hibernate.orm.test.unidir; import java.io.Serializable; -import java.util.Arrays; import java.util.List; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -18,10 +17,8 @@ import jakarta.persistence.Table; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; -import org.hibernate.dialect.MySQL5Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; -import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java index d2f8c9e418..9cb1aa0711 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/mappedsuperclass/HbmMappingMappedSuperclassWithVersionTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.transaction.TransactionUtil; diff --git a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java index 4d8fd08364..863cfab0de 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingCriteriaTest.java @@ -18,7 +18,7 @@ import jakarta.persistence.criteria.ParameterExpression; import jakarta.persistence.criteria.Root; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java index 81cab954f5..dce3d2d70b 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/InClauseParameterPaddingTest.java @@ -12,7 +12,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java index b73d5ff1d0..79a80d4c46 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/IntegerRepresentationLiteralParsingExceptionTest.java @@ -3,7 +3,7 @@ package org.hibernate.query; import jakarta.persistence.Entity; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java b/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java index 7a8132d8cf..4595805e96 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/MaxInExpressionParameterPaddingTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java b/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java index 7eba5eec05..69fb1b50e3 100644 --- a/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/query/NativeQueryWithParenthesesTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java index 329e380af9..8b1241cf5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java @@ -16,7 +16,7 @@ import jakarta.persistence.Table; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java index 7f997afa7b..526db2238d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java @@ -16,19 +16,13 @@ import java.util.List; import java.util.Locale; import org.hibernate.MappingException; -import org.hibernate.dialect.CockroachDialect; import org.hibernate.query.Query; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.AbstractHANADialect; -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.dialect.PostgreSQL81Dialect; -import org.hibernate.dialect.PostgreSQL9Dialect; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.query.NativeQuery; import org.hibernate.stat.Statistics; import org.hibernate.type.DateType; @@ -103,11 +97,6 @@ public class QueryAndSQLTest extends BaseCoreFunctionalTestCase { @Test @TestForIssue( jiraKey = "HHH-10161") - @SkipForDialect(value = Oracle8iDialect.class, jiraKey = "HHH-10161", comment = "Cannot convert untyped null (assumed to be BINARY type) to NUMBER") - @SkipForDialect(value = PostgreSQL9Dialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to BIGINT") public void testQueryWithNullParameter(){ Chaos c0 = new Chaos(); c0.setId( 0L ); @@ -188,11 +177,6 @@ public class QueryAndSQLTest extends BaseCoreFunctionalTestCase { @Test @TestForIssue( jiraKey = "HHH-10161") - @SkipForDialect(value = Oracle8iDialect.class, jiraKey = "HHH-10161", comment = "Cannot convert untyped null (assumed to be BINARY type) to NUMBER") - @SkipForDialect(value = PostgreSQL9Dialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = PostgresPlusDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = CockroachDialect.class, jiraKey = "HHH-10312", comment = "Cannot convert untyped null (assumed to be bytea type) to bigint") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to BIGINT") public void testNativeQueryWithNullParameter(){ Chaos c0 = new Chaos(); c0.setId( 0L ); @@ -521,7 +505,7 @@ public class QueryAndSQLTest extends BaseCoreFunctionalTestCase { } @Test - @SkipForDialect(value = { PostgreSQL81Dialect.class, PostgreSQLDialect.class }, + @SkipForDialect(value = { PostgreSQLDialect.class }, comment = "postgresql jdbc driver does not implement the setQueryTimeout method") public void testCache() throws Exception { Session s; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java index 9e2522898c..9cbf334e39 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java @@ -13,7 +13,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java index 3dc7879ff2..a2908a34df 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java @@ -742,7 +742,6 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { @Test @TestForIssue( jiraKey = "HHH-2851") - @SkipForDialect(value = DerbyDialect.class, comment = "Cannot convert untyped null (assumed to be VARBINARY type) to VARCHAR") public void testMultipleRefsToSameParam() { Session s = openSession(); s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java index 7af10a4be3..c3d28b970d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java @@ -8,7 +8,7 @@ import jakarta.persistence.Query; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java index 8c80e61f8a..ee2d9fbf87 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/JoinOnClauseTest.java @@ -6,14 +6,12 @@ */ package org.hibernate.test.hql; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java index f1a95fb9a3..1c0258476f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/SelectNewEmbeddedIdTest.java @@ -14,7 +14,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; import jakarta.persistence.Query; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java index b233717c1d..a9c5dc76b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/UpdateJoinedSubclassCorrelationTest.java @@ -1,6 +1,6 @@ package org.hibernate.test.hql; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java index 65cb655490..e0be5b20fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/hql/size/WhereClauseOrderBySizeTest.java @@ -27,7 +27,7 @@ import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQL82Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java index 80c5b03b3d..31d0deb033 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java @@ -15,20 +15,17 @@ import jakarta.persistence.Id; import jakarta.persistence.PersistenceException; import jakarta.persistence.Table; -import org.hibernate.HibernateException; import org.hibernate.annotations.TypeDef; import org.hibernate.boot.spi.MetadataBuilderContributor; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.NativeQuery; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.util.ExceptionUtil; -import org.hibernate.test.id.usertype.inet.Event; import org.hibernate.test.id.usertype.inet.Inet; import org.hibernate.test.id.usertype.inet.InetType; -import org.hibernate.test.id.usertype.inet.PostgreSQLInetTypesOtherTest; import org.hibernate.test.id.usertype.json.Json; import org.hibernate.test.id.usertype.json.JsonType; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java index 5da9f74d33..726d20bc0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java @@ -14,13 +14,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.annotations.TypeDef; import org.hibernate.boot.MetadataBuilder; import org.hibernate.boot.spi.MetadataBuilderContributor; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.query.NativeQuery; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java index 5e24426c1c..0d02278b4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java @@ -9,10 +9,9 @@ package org.hibernate.test.id.usertype.inet; import java.util.List; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.NativeQuery; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java index 637a622338..b1a59b5ab1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.MappedSuperclass; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.SemanticException; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/SingleTableUpdateQueryTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/SingleTableUpdateQueryTest.java index a25d979445..eb032a71b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/SingleTableUpdateQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/SingleTableUpdateQueryTest.java @@ -8,7 +8,7 @@ package org.hibernate.test.joinedsubclass; import java.util.Map; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.jdbc.SQLStatementInterceptor; diff --git a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java index 4ced747019..0cfca4f0bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/joinfetch/enhanced/JoinFetchWithEnhancementTest.java @@ -29,7 +29,7 @@ import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java index 428ddc6025..4141dea77c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/EntityManagerUnwrapTest.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.spi.MetamodelImplementor; import org.hibernate.query.spi.QueryEngine; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java index 135a5cdf3b..ad70622c81 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/convert/JdbcTypeDescriptorConverterTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java index 4a779830a5..1bf561cf5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -10,7 +10,7 @@ import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java index 1a95885969..7b322fe406 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneEagerOrphanRemovalTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.FetchType; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java index 4a7bb51c44..9b8d42d115 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.FetchType; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java index 7e68872de4..f321d28a08 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/OneToOneLazyOrphanRemovalTest.java @@ -11,7 +11,7 @@ import jakarta.persistence.FetchType; import jakarta.persistence.Id; import jakarta.persistence.OneToOne; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Test; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java index 9f1b31dfa7..b2f46b00ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/jpa/orphan/one2one/embedded/OneToOneLazyOrphanRemovalInEmbeddedEntityTest.java @@ -6,7 +6,7 @@ */ package org.hibernate.test.jpa.orphan.one2one.embedded; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java index db4f779d57..9fb27e0d15 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14276/NestedIdClassDerivedIdentifiersTest.java @@ -11,7 +11,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.sqm.mutation.internal.inline.InlineStrategy; import org.hibernate.test.mapping.hhh14276.entity.PlayerStat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/NestedIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/NestedIdClassTest.java index 8a70e62672..efabd1611d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/NestedIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/mapping/hhh14343/NestedIdClassTest.java @@ -7,7 +7,7 @@ package org.hibernate.test.mapping.hhh14343; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.query.sqm.mutation.internal.inline.InlineStrategy; import org.hibernate.test.mapping.hhh14343.entity.NestedPlayerStat; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java index af169ce56f..af53e74b04 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/HANAStoredProcedureTest.java @@ -31,7 +31,7 @@ import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.AbstractHANADialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Output; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java index 0f4a88b040..49c415dbf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/MySQLStoredProcedureTest.java @@ -22,7 +22,7 @@ import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.MySQL5Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Output; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java index 7de27ceaf3..ef79dbdb16 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/OracleStoredProcedureTest.java @@ -8,7 +8,6 @@ package org.hibernate.test.procedure; import java.math.BigDecimal; import java.sql.CallableStatement; -import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -28,8 +27,7 @@ import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; -import org.hibernate.jdbc.Work; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Output; @@ -37,10 +35,8 @@ import org.hibernate.result.ResultSetOutput; import org.hibernate.type.NumericBooleanType; import org.hibernate.type.YesNoType; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.transaction.TransactionUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java index e4b5094c85..1a33a0b159 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/PostgreSQLStoredProcedureTest.java @@ -20,7 +20,7 @@ import jakarta.persistence.ParameterMode; import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.procedure.ProcedureCall; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java index 11b8e12695..9eef9fbb22 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossDatabaseTest.java @@ -7,26 +7,17 @@ package org.hibernate.test.procedure; import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Timestamp; import java.sql.Types; -import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.Collections; import jakarta.persistence.EntityManager; import jakarta.persistence.ParameterMode; import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.dialect.SQLServer2012Dialect; -import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java index 49c1bdde9c..6ff1f17af8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureCrossSchemaTest.java @@ -6,12 +6,11 @@ */ package org.hibernate.test.procedure; -import java.sql.SQLException; import jakarta.persistence.ParameterMode; import jakarta.persistence.StoredProcedureQuery; import org.hibernate.dialect.SQLServer2012Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java index acf24abb5c..b54f0b5ca9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/procedure/SQLServerStoredProcedureTest.java @@ -7,9 +7,6 @@ package org.hibernate.test.procedure; import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; import java.sql.Timestamp; import java.sql.Types; import java.time.LocalDateTime; @@ -22,8 +19,7 @@ import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.SQLServer2012Dialect; -import org.hibernate.jdbc.Work; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.junit.Before; diff --git a/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java b/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java index 31bd1b6bf8..69b352de0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/replicate/ReplicateTest.java @@ -13,7 +13,7 @@ import jakarta.persistence.Id; import org.hibernate.ReplicationMode; import org.hibernate.Session; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.FailureExpected; diff --git a/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java b/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java index 4fb717db61..607723a49e 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/stats/QueryStatsMaxSizeTest.java @@ -6,28 +6,18 @@ */ package org.hibernate.test.stats; -import java.lang.reflect.Field; -import java.util.HashSet; import java.util.Map; import jakarta.persistence.Entity; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.Id; -import org.hibernate.Hibernate; -import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.Transaction; import org.hibernate.annotations.NaturalId; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.internal.util.collections.BoundedConcurrentHashMap; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; -import org.hibernate.stat.SessionStatistics; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; -import org.hibernate.stat.internal.StatisticsImpl; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java index b7e6f71e0d..f20441b763 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/LongListTypeContributorTest.java @@ -17,7 +17,7 @@ import jakarta.persistence.Table; import org.hibernate.boot.model.TypeContributions; import org.hibernate.boot.model.TypeContributor; import org.hibernate.jpa.boot.spi.TypeContributorList; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.service.ServiceRegistry; import org.hibernate.type.AbstractSingleColumnStandardBasicType; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java index 062253f054..14d211500d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/type/SmallIntToShortClassMappingTest.java @@ -15,7 +15,7 @@ import jakarta.persistence.Id; import jakarta.persistence.Table; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/hibernate.cfg.xml b/hibernate-core/src/test/resources/org/hibernate/jpa/test/hibernate.cfg.xml index c20ab50a7e..4d58f90021 100644 --- a/hibernate-core/src/test/resources/org/hibernate/jpa/test/hibernate.cfg.xml +++ b/hibernate-core/src/test/resources/org/hibernate/jpa/test/hibernate.cfg.xml @@ -23,11 +23,11 @@ create-drop true org.hibernate.testing.cache.CachingRegionFactory - - - - - - + + + + + + \ No newline at end of file diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml b/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml index 6187cb7a8b..2330b56006 100644 --- a/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml +++ b/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml @@ -13,24 +13,24 @@ org.hibernate.jpa.HibernatePersistenceProvider - org.hibernate.jpa.test.persistenceunit.DataPoint + org.hibernate.orm.test.jpa.persistenceunit.DataPoint org.hibernate.jpa.HibernatePersistenceProvider - org.hibernate.jpa.test.persistenceunit.DataPoint + org.hibernate.orm.test.jpa.persistenceunit.DataPoint org.hibernate.jpa.HibernatePersistenceProvider - org.hibernate.jpa.test.persistenceunit.DataPoint + org.hibernate.orm.test.jpa.persistenceunit.DataPoint false org.hibernate.jpa.HibernatePersistenceProvider - org.hibernate.jpa.test.persistenceunit.DataPoint + org.hibernate.orm.test.jpa.persistenceunit.DataPoint true diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistenceUnitForNameDuplicationTest.xml b/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistenceUnitForNameDuplicationTest.xml index 513173e8df..1ba10c8749 100644 --- a/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistenceUnitForNameDuplicationTest.xml +++ b/hibernate-core/src/test/resources/org/hibernate/jpa/test/persistenceunit/META-INF/persistenceUnitForNameDuplicationTest.xml @@ -15,10 +15,10 @@ The PU name is also present in the persistence.xml located in the same folder, this should cause a warn message to be logged. - See org.hibernate.jpa.test.persistenceunit.DuplicatePersistenceUnitNameTest + See org.hibernate.orm.test.jpa.persistenceunit.DuplicatePersistenceUnitNameTest --> org.hibernate.jpa.HibernatePersistenceProvider - org.hibernate.jpa.test.persistenceunit.DataPoint + org.hibernate.orm.test.jpa.persistenceunit.DataPoint \ No newline at end of file diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/create-script-source.sql b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/create-script-source.sql similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/create-script-source.sql rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/create-script-source.sql diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/create-script-source2.sql b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/create-script-source2.sql similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/create-script-source2.sql rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/create-script-source2.sql diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/drop-script-source.sql b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/drop-script-source.sql similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/drop-script-source.sql rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/drop-script-source.sql diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/drop-script-source2.sql b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/drop-script-source2.sql similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/drop-script-source2.sql rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/drop-script-source2.sql diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/load-script-source.sql b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/load-script-source.sql similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/load-script-source.sql rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/load-script-source.sql diff --git a/hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/load-script-source2.sql b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/load-script-source2.sql similarity index 100% rename from hibernate-core/src/test/resources/org/hibernate/jpa/test/schemagen/iso8859/load-script-source2.sql rename to hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/schemagen/iso8859/load-script-source2.sql diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml index c6ad07ec2e..c882c1bf11 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/invalid-orm-1_0.xml @@ -16,14 +16,14 @@ - + org.hibernate.ejb.test.pack.defaultpar_1_0 - + @@ -31,7 +31,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml index afb1581b18..0a31d9b178 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-1_0.xml @@ -13,14 +13,14 @@ - + - org.hibernate.jpa.test.pack.defaultpar_1_0 - + org.hibernate.orm.test.jpa.pack.defaultpar_1_0 + @@ -28,7 +28,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml index 4ee4f764c9..ba43c4f669 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_0.xml @@ -15,13 +15,13 @@ - + - org.hibernate.jpa.test.pack.defaultpar + org.hibernate.orm.test.jpa.pack.defaultpar diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml index 09b5c1010c..2e31985d34 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_1.xml @@ -15,13 +15,13 @@ - + - org.hibernate.jpa.test.pack.defaultpar + org.hibernate.orm.test.jpa.pack.defaultpar diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml index b0872c6852..25820e41d5 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/xml/versions/valid-orm-2_2.xml @@ -19,13 +19,13 @@ - + - org.hibernate.jpa.test.pack.defaultpar + org.hibernate.orm.test.jpa.pack.defaultpar