From 84a64f9640f2c698d05bdf10ecc94e86394e8230 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 18:52:37 +1300 Subject: [PATCH] Refactor tests, move BaseTestCase and annotations @ForPlatform @IgnorePlatform --- ebean-test/src/test/java/io/ebean/DbPrimaryTest.java | 3 ++- .../src/test/java/io/ebean/test/DbJsonTest.java | 2 +- .../test/java/io/ebean/{ => xtest}/BaseTestCase.java | 3 ++- .../io/ebean/{annotation => xtest}/ForPlatform.java | 4 +++- .../ebean/{annotation => xtest}/IgnorePlatform.java | 4 +++- .../test/java/io/ebean/xtest/base/DtoQuery2Test.java | 2 +- .../io/ebean/xtest/base/DtoQueryFromOrmTest.java | 4 ++-- .../test/java/io/ebean/xtest/base/DtoQueryTest.java | 4 ++-- .../base/EbeanServerFactory_MultiTenancy_Test.java | 2 +- .../xtest/base/EbeanServer_deleteAllByIdTest.java | 2 +- .../ebean/xtest/base/EbeanServer_deleteByIdTest.java | 2 +- .../io/ebean/xtest/base/EbeanServer_deleteTest.java | 2 +- .../io/ebean/xtest/base/EbeanServer_eqlTest.java | 2 +- .../io/ebean/xtest/base/EbeanServer_saveAllTest.java | 2 +- .../java/io/ebean/xtest/base/ExtendedServerTest.java | 1 + .../java/io/ebean/xtest/base/FetchGroupTest.java | 2 +- .../java/io/ebean/xtest/base/PlatformCondition.java | 4 ++-- .../java/io/ebean/xtest/base/SqlRowBooleanTest.java | 2 +- .../io/ebean/xtest/base/TestDirtyProperties.java | 2 +- .../java/io/ebean/xtest/base/TestFilterWithEnum.java | 2 +- .../ebean/xtest/base/TestUnsetLoadedProperties.java | 4 ++-- .../io/ebean/xtest/base/TransactionalTestCase.java | 2 +- .../java/io/ebean/xtest/base/UpdateQueryTest.java | 5 +++-- .../io/ebean/xtest/bean/EntityBeanInterceptTest.java | 2 +- .../xtest/config/ServerConfigSqlServerTest.java | 2 +- .../java/io/ebean/xtest/config/TestTableName.java | 2 +- .../config/dbplatform/DatabasePlatformBaseTest.java | 4 ++-- .../sqlserver/SqlServerStepSequenceTest.java | 4 ++-- .../xtest/docstore/DocStoreBeanBaseAdapterTest.java | 2 +- .../io/ebean/xtest/event/BeanFindControllerTest.java | 2 +- .../java/io/ebean/xtest/event/BeanPostLoadTest.java | 1 + .../BinaryTransactionEventReadWriteTest.java | 2 +- .../executor/TestShutdownWithBackgroundTasks.java | 2 +- .../xtest/internal/server/grammer/EqlParserTest.java | 6 +++--- .../internal/server/lib/ShutdownManagerTest.java | 2 +- .../server/query/LimitOffsetPagedListTest.java | 2 +- .../query/TestFutureRowCountErrorHandling.java | 1 + .../internal/server/rawsql/TestRawSqlBuilder.java | 3 ++- .../internal/server/rawsql/TestRawSqlParsing.java | 3 ++- .../server/text/json/TestJsonWriteVisitor.java | 2 +- .../text/json/TestTextJsonBeanReadVisitor.java | 2 +- .../DefaultTransactionThreadLocalTest.java | 3 ++- .../server/transaction/TransactionManagerTest.java | 2 +- .../internal/server/transaction/TransactionTest.java | 2 +- .../java/io/ebean/xtest/json/JsonBeanReaderTest.java | 2 +- .../java/io/ebean/xtest/plugin/SpiServerTest.java | 2 +- .../io/ebean/xtest/text/PathPropertiesTests.java | 2 +- .../ebeaninternal/dbmigration/DbMigrationTest.java | 3 ++- .../server/cache/CacheBeanDataTest.java | 2 +- .../server/cache/CachedBeanDataFromBeanTest.java | 2 +- .../server/cache/CachedBeanDataSerializeTest.java | 2 +- .../server/changelog/ChangeJsonBuilderTest.java | 2 +- .../changelog/DefaultChangeLogListenerTest.java | 2 +- .../changelog/DefaultChangeLogRegisterTest.java | 2 +- .../DefaultServer_createOrmQueryRequestTest.java | 2 +- .../server/core/DefaultServer_getReferenceTest.java | 2 +- .../server/core/TestDiffHelpSimple.java | 2 +- .../server/core/TestDiffHelpWithEmbedded.java | 2 +- .../server/deploy/BeanDescriptorTest.java | 2 +- .../deploy/BeanDescriptor_documentMappingTest.java | 2 +- .../BeanDescriptor_whenCreatedPropertyTest.java | 2 +- .../server/deploy/BeanPropertyAssocManyTest.java | 2 +- .../server/deploy/DeployPropertyParserTest.java | 4 ++-- .../server/deploy/FormulaPropertyPathTest.java | 2 +- .../deploy/TestBeanDescriptorHasIdProperty.java | 2 +- .../server/deploy/TestCollectionLoadedStatus.java | 2 +- .../server/deploy/TestDiffHelpInsertSimple.java | 2 +- .../deploy/TestDiffHelpInsertWithEmbedded.java | 2 +- .../server/deploy/TestNotEnhancedMappedSuper.java | 2 +- .../TestReferenceWithConstructorProperties.java | 2 +- .../server/expression/BaseExpressionTest.java | 2 +- .../expression/IsEmptyExpressionQueryTest.java | 2 +- .../server/expression/PrepareDocNestedTest.java | 2 +- .../server/loadcontext/DLoadContextTest.java | 2 +- .../server/querydefn/DefaultOrmQueryTest.java | 2 +- .../server/querydefn/OrmQueryDetailTest.java | 2 +- .../io/ebeaninternal/server/type/TestBinaryUUID.java | 2 +- .../server/type/TestSimpleEncryptor.java | 2 +- .../ebeaninternal/server/type/TestTypeManager.java | 2 +- .../test/java/org/etest/ForTestsBeforeAfterTest.java | 4 ++-- ebean-test/src/test/java/org/etest/ForTestsTest.java | 4 ++-- .../partition/MultiTenantPartitionTest.java | 2 +- .../tests/aggregateformula/TestAggregateFormula.java | 4 ++-- .../TestAggregateInheritFormula.java | 2 +- .../java/org/tests/basic/TestAnnotationBase.java | 2 +- .../org/tests/basic/TestAssocOneEqExpression.java | 2 +- .../src/test/java/org/tests/basic/TestBatchLazy.java | 2 +- .../test/java/org/tests/basic/TestBatchLazyMany.java | 2 +- .../org/tests/basic/TestBeanReferenceRefresh.java | 2 +- .../java/org/tests/basic/TestCreateEntityBean.java | 4 ++-- .../tests/basic/TestDeleteCascadingOneToMany.java | 2 +- .../org/tests/basic/TestDeleteImportedPartial.java | 2 +- .../java/org/tests/basic/TestDeleteOneToOne.java | 2 +- .../org/tests/basic/TestDeleteOneToOneMultiple.java | 2 +- .../org/tests/basic/TestDeletePartialNoVersion.java | 2 +- .../test/java/org/tests/basic/TestDynamicUpdate.java | 2 +- .../TestEnhancementCollectionInitialisation.java | 2 +- .../test/java/org/tests/basic/TestErrorBindLog.java | 2 +- .../java/org/tests/basic/TestExplicitInsert.java | 2 +- .../src/test/java/org/tests/basic/TestFetchId.java | 2 +- .../test/java/org/tests/basic/TestIUDVanilla.java | 2 +- .../src/test/java/org/tests/basic/TestInEmpty.java | 2 +- .../test/java/org/tests/basic/TestInheritRef.java | 2 +- .../src/test/java/org/tests/basic/TestJodaType.java | 2 +- .../java/org/tests/basic/TestJoinInheritance.java | 2 +- .../org/tests/basic/TestLazyLoadEmptyOneToMany.java | 2 +- .../java/org/tests/basic/TestLazyLoadInCache.java | 2 +- .../test/java/org/tests/basic/TestLimitQuery.java | 2 +- .../test/java/org/tests/basic/TestLoadBeanCache.java | 2 +- .../java/org/tests/basic/TestLogTransLogOnError.java | 2 +- .../test/java/org/tests/basic/TestM2MCascadeOne.java | 2 +- .../test/java/org/tests/basic/TestM2MVanilla.java | 2 +- .../test/java/org/tests/basic/TestManyLazyLoad.java | 2 +- .../java/org/tests/basic/TestManyOneInterface.java | 2 +- .../test/java/org/tests/basic/TestMappedSuper.java | 2 +- .../java/org/tests/basic/TestMetaAnnotation.java | 4 ++-- .../org/tests/basic/TestMultipleOneToOneIUD.java | 2 +- .../java/org/tests/basic/TestNonUpdateProperty.java | 2 +- .../org/tests/basic/TestOrderTotalAmountFormula.java | 2 +- .../tests/basic/TestOrderTotalAmountReportBean.java | 1 + .../org/tests/basic/TestOrderTotalAmountSql.java | 2 +- .../java/org/tests/basic/TestPersistenceContext.java | 2 +- .../java/org/tests/basic/TestQueryForUpdate.java | 3 ++- .../tests/basic/TestQueryForUpdatePostgresLock.java | 4 ++-- .../org/tests/basic/TestQueryUsingConnection.java | 4 ++-- .../java/org/tests/basic/TestQueryWhereBetween.java | 2 +- .../java/org/tests/basic/TestQueryWhereInRange.java | 2 +- .../java/org/tests/basic/TestQueryWithCache.java | 2 +- .../org/tests/basic/TestReadOnlyPropagation.java | 2 +- .../java/org/tests/basic/TestSaveDeleteOneToOne.java | 2 +- .../tests/basic/TestSaveDeleteOneToOneMultiple.java | 2 +- .../tests/basic/TestSharedInstancePropagation.java | 2 +- .../src/test/java/org/tests/basic/TestTransient.java | 2 +- .../src/test/java/org/tests/basic/TestUpdate.java | 2 +- .../java/org/tests/basic/TestUpdateManyToOne.java | 2 +- .../test/java/org/tests/basic/TestUuidInsert.java | 2 +- .../org/tests/basic/TestUuidInsertMasterDetail.java | 2 +- .../org/tests/basic/delete/TestDeleteByIdList.java | 2 +- .../tests/basic/delete/TestDeleteCascadeById.java | 2 +- .../tests/basic/delete/TestDeleteCascadeByQuery.java | 2 +- .../java/org/tests/basic/encrypt/TestEncrypt.java | 6 +++--- .../org/tests/basic/encrypt/TestEncryptBinary.java | 2 +- .../tests/basic/encrypt/TestEncryptClientSide.java | 2 +- .../tests/basic/event/TestPreInsertValidation.java | 2 +- .../java/org/tests/basic/event/TestQueryAdapter.java | 2 +- .../org/tests/basic/lob/TestBasicClobFetchEager.java | 2 +- .../java/org/tests/basic/lob/TestBasicClobNoVer.java | 2 +- .../test/java/org/tests/basic/lob/TestByteOnly.java | 2 +- .../basic/one2one/TestOne2OneBookingInvoice.java | 2 +- .../tests/basic/one2one/TestOneToOneWheelTire.java | 2 +- .../tests/basic/type/TestEnumValueAnnotation.java | 2 +- .../org/tests/basic/type/TestExtraScalarTypes.java | 2 +- .../tests/basic/type/TestQueryBooleanProperty.java | 2 +- .../java/org/tests/basic/type/TestSqlRowUUID.java | 2 +- .../java/org/tests/basic/type/TestTransientMap.java | 2 +- .../org/tests/batchinsert/TestBatchInsertFlush.java | 3 ++- .../org/tests/batchinsert/TestBatchInsertSimple.java | 4 ++-- .../TestBatchInsertWithInitialisedCollection.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 4 ++-- .../batchinsert/TestBatchSaveWithGetBeanId.java | 4 ++-- .../test/java/org/tests/batchload/TestBasicLazy.java | 2 +- .../org/tests/batchload/TestBasicNavOnEmpty.java | 2 +- .../tests/batchload/TestBatchLazyWithCacheHits.java | 2 +- .../tests/batchload/TestBatchLazyWithDeleted.java | 2 +- .../test/java/org/tests/batchload/TestBeanState.java | 2 +- .../org/tests/batchload/TestEmptyManyLazyLoad.java | 2 +- .../test/java/org/tests/batchload/TestLazyJoin.java | 2 +- .../test/java/org/tests/batchload/TestLazyJoin2.java | 2 +- .../tests/batchload/TestLazyLoadNonExistantBean.java | 2 +- .../tests/batchload/TestLazyLoadNonExistentBean.java | 2 +- .../tests/batchload/TestQueryDisableLazyLoad.java | 2 +- .../test/java/org/tests/batchload/TestQueryJoin.java | 2 +- .../org/tests/batchload/TestQueryJoinToAssocOne.java | 2 +- .../org/tests/batchload/TestSecondQueryNoRows.java | 2 +- .../src/test/java/org/tests/cache/TestBeanCache.java | 2 +- .../java/org/tests/cache/TestBeanCacheAsync.java | 2 +- .../tests/cache/TestBeanCacheContactLazyLoad.java | 2 +- .../tests/cache/TestBeanCacheWithDeleteQuery.java | 2 +- .../java/org/tests/cache/TestBeanFetchJoinCache.java | 2 +- .../test/java/org/tests/cache/TestCacheBasic.java | 2 +- .../java/org/tests/cache/TestCacheCollectionIds.java | 1 + .../test/java/org/tests/cache/TestCacheCustomer.java | 2 +- .../test/java/org/tests/cache/TestCacheDelete.java | 2 +- .../java/org/tests/cache/TestCacheEmbeddedId.java | 2 +- .../cache/TestCacheInterceptSaveWhenLazyLoaded.java | 2 +- .../java/org/tests/cache/TestCacheManyToOne.java | 2 +- .../java/org/tests/cache/TestCacheNaturalId.java | 2 +- .../org/tests/cache/TestExternalNotification.java | 2 +- .../org/tests/cache/TestL2CacheWithSharedBean.java | 2 +- .../org/tests/cache/TestL2DirtyFlagOnLazyLoad.java | 2 +- .../src/test/java/org/tests/cache/TestM2MCache.java | 2 +- .../test/java/org/tests/cache/TestQueryCache.java | 2 +- .../java/org/tests/cache/TestQueryCacheCountry.java | 2 +- .../java/org/tests/cache/TestQueryCacheInsert.java | 2 +- .../java/org/tests/cache/TestQueryCacheReadOnly.java | 1 + .../tests/cache/TestQueryCacheTableDependency.java | 2 +- .../org/tests/cache/personinfo/TestStringIdOnly.java | 2 +- .../java/org/tests/callable/TestMysqlCallable.java | 2 +- .../cascade/TestCascadeOrphanStatelessUpdate.java | 2 +- .../java/org/tests/cascade/TestDeleteO2MOrphans.java | 2 +- .../org/tests/cascade/TestMasterDetailDelete.java | 2 +- .../org/tests/cascade/TestMultiCascadeBatch.java | 2 +- .../java/org/tests/cascade/TestOnlyKillOrphans.java | 2 +- .../test/java/org/tests/cascade/TestOrderedList.java | 2 +- .../java/org/tests/cascade/TestPrivateOwned.java | 2 +- .../cascade/TestPrivateOwnedAddRemoveOrphan.java | 2 +- .../tests/cascade/TestPrivateOwnedCascadeOrder.java | 2 +- .../TestPrivateOwnedIgnoreTransientOrphan.java | 2 +- .../test/java/org/tests/changelog/TestChangeLog.java | 2 +- .../java/org/tests/changelog/TestChangeLogInt.java | 2 +- .../java/org/tests/compositekeys/TestCKeyDelete.java | 2 +- .../tests/compositekeys/TestCKeyIdInExpression.java | 2 +- .../org/tests/compositekeys/TestCKeyLazyLoad.java | 2 +- .../TestCaoCompositeKeyWithAnnotationOverrides.java | 2 +- .../test/java/org/tests/compositekeys/TestCore.java | 2 +- ...TestOnCascadeDeleteChildrenWithCompositeKeys.java | 2 +- .../tests/contructor/TestProtectedConstructor.java | 2 +- .../test/java/org/tests/ddl/TestForeignKeyModes.java | 4 ++-- .../java/org/tests/defaultvalues/TestDefaults.java | 2 +- .../org/tests/delete/TestDeleteByIdUsingModel.java | 2 +- .../delete/TestDeleteByIdWithPersistenceContext.java | 2 +- .../java/org/tests/delete/TestDeleteByQuery.java | 3 ++- .../tests/delete/TestDeleteCascadeWithListener.java | 2 +- .../delete/TestDeleteWithoutOptimisticLocking.java | 2 +- .../java/org/tests/docstore/CustomerReportTest.java | 2 +- .../test/java/org/tests/draftable/DocLinkTest.java | 2 +- .../src/test/java/org/tests/el/TestELBasic.java | 2 +- .../test/java/org/tests/el/TestUnderscoreParam.java | 2 +- .../tests/enhancement/TestConstructorManyAddAll.java | 2 +- .../TestConstructorPutfieldReplacement.java | 2 +- .../org/tests/enhancement/TestEnhancementEquals.java | 2 +- .../expression/bitwise/TestBitwiseExpressions.java | 2 +- .../test/java/org/tests/family/TestInheritance.java | 4 ++-- .../org/tests/generated/TestGeneratedProperties.java | 2 +- .../java/org/tests/generated/TestGeneratedWho.java | 2 +- .../src/test/java/org/tests/genkey/TestSeqBatch.java | 2 +- .../java/org/tests/history/TestHistoryInsert.java | 3 ++- .../src/test/java/org/tests/idkeys/TestCustomId.java | 2 +- .../java/org/tests/idkeys/TestGeneratedKeys.java | 12 ++++++------ .../src/test/java/org/tests/idkeys/TestLazyLoad.java | 2 +- .../java/org/tests/idkeys/TestSimpleIdInsert.java | 2 +- .../tests/inheritance/TestDuplicateKeyException.java | 2 +- .../org/tests/inheritance/TestInheritInsert.java | 2 +- .../TestInheritanceDiscriminatorQueryCache.java | 2 +- .../org/tests/inheritance/TestInheritanceJoins.java | 2 +- .../org/tests/inheritance/TestInheritanceOnMany.java | 2 +- .../inheritance/TestInheritanceOrderColumn.java | 2 +- .../org/tests/inheritance/TestInheritanceQuery.java | 2 +- .../org/tests/inheritance/TestInheritanceRawSql.java | 2 +- .../tests/inheritance/TestInheritanceRefBean.java | 2 +- .../java/org/tests/inheritance/TestIntInherit.java | 2 +- .../tests/inheritance/TestNpeOnDiscriminator.java | 2 +- .../java/org/tests/inheritance/TestSkippable.java | 2 +- .../org/tests/inheritance/TestTreeOrganisations.java | 2 +- .../inheritance/abstrakt/TestInheritanceNum.java | 2 +- .../bothsides/TestInheritanceBothSides.java | 2 +- .../inheritance/cache/TestInheritanceCache.java | 2 +- .../inheritance/cache/TestInheritanceRefCache.java | 2 +- .../cascadedelete/TestInheritanceDeleteCascade.java | 2 +- .../java/org/tests/insert/TestInsertCheckUnique.java | 2 +- .../java/org/tests/insert/TestInsertCollection.java | 2 +- .../insert/TestInsertDataIntegrityException.java | 4 ++-- .../org/tests/insert/TestInsertDuplicateKey.java | 2 +- .../java/org/tests/insert/TestInsertOnStringKey.java | 2 +- .../org/tests/insert/TestInsertWithIdAndUuid.java | 2 +- .../test/java/org/tests/insert/TestOnlyIdEntity.java | 4 ++-- .../tests/insert/TestSaveWithDaylightSavings.java | 2 +- .../src/test/java/org/tests/iud/TestCarWheelIud.java | 2 +- .../test/java/org/tests/iud/TestInfoOneToOne.java | 2 +- .../java/org/tests/iud/TestInsertQueryUpdate.java | 2 +- .../java/org/tests/iud/TestInsertUpdateTrans.java | 2 +- .../test/java/org/tests/iud/TestPersistCascade.java | 2 +- .../test/java/org/tests/json/TestDbJson_Jackson.java | 2 +- .../java/org/tests/json/TestDbJson_Jackson2.java | 2 +- .../java/org/tests/json/TestDbJson_Jackson3.java | 4 ++-- .../test/java/org/tests/json/TestDbJson_List.java | 4 ++-- .../test/java/org/tests/json/TestJsonMapBasic.java | 4 ++-- .../test/java/org/tests/json/TestJsonMapBlob.java | 2 +- .../test/java/org/tests/json/TestJsonMapClob.java | 2 +- .../test/java/org/tests/json/TestJsonMapJsonB.java | 2 +- .../test/java/org/tests/json/TestJsonMapVarchar.java | 2 +- .../test/java/org/tests/json/TestJsonNodeBasic.java | 2 +- .../test/java/org/tests/json/TestJsonNodeBlob.java | 2 +- .../test/java/org/tests/json/TestJsonNodeJsonb.java | 2 +- .../java/org/tests/json/TestJsonNodeVarchar.java | 2 +- .../test/java/org/tests/json/TestJsonNullValues.java | 2 +- .../java/org/tests/json/TestJsonSourceDefault.java | 2 +- .../src/test/java/org/tests/json/TestOldValue.java | 2 +- .../java/org/tests/json/TestUnmappedProperties.java | 2 +- .../tests/lazyforeignkeys/TestLazyForeignKeys.java | 8 ++++---- .../java/org/tests/level/test/ManyToManyTest.java | 2 +- .../tests/lifecycle/TestLifecycleAnnotatedBean.java | 2 +- .../org/tests/lifecycle/TestLifecycleExceptions.java | 2 +- .../org/tests/lifecycle/TestLifecycleWithLog.java | 2 +- .../tests/m2m/TestM2MDeleteCascadeFromParent.java | 2 +- .../java/org/tests/m2m/TestM2MDeleteNoCascade.java | 4 ++-- .../m2m/TestM2MDeleteObjectWithCascadeToM2m.java | 2 +- .../java/org/tests/m2m/TestM2MDeleteWithCascade.java | 2 +- .../org/tests/m2m/TestM2MDistinct_sqlServer.java | 4 ++-- .../test/java/org/tests/m2m/TestM2MModifyTest.java | 2 +- .../java/org/tests/m2m/TestM2MMultipleLists.java | 2 +- .../java/org/tests/m2m/TestM2MSelfRelationship.java | 2 +- .../test/java/org/tests/m2m/TestM2mDeleteObject.java | 2 +- .../m2m/softdelete/TestM2MSoftDeleteExists.java | 2 +- .../test/java/org/tests/merge/TestMergeBasic.java | 2 +- .../test/java/org/tests/merge/TestMergeCustomer.java | 1 + .../src/test/java/org/tests/merge/TestMergeM2M.java | 2 +- .../tests/model/aggregation/TestAggregationMany.java | 2 +- .../model/aggregation/TestAggregationTopLevel.java | 2 +- .../org/tests/model/array/TestDbArray_asSet.java | 4 ++-- .../org/tests/model/array/TestDbArray_basic.java | 5 +++-- .../basic/cache/TestCacheViaComplexNaturalKey.java | 2 +- .../basic/cache/TestCacheViaComplexNaturalKey3.java | 2 +- .../model/basic/cache/TestCacheWithSoftDelete.java | 2 +- .../model/basic/cache/TestNatKeyCacheWhenNull.java | 2 +- .../basic/cache/TestNatKeyCacheWithForeignKey.java | 2 +- .../org/tests/model/basic/cache/TestNatKeyUid.java | 2 +- .../org/tests/model/basic/first/TestFirstSecond.java | 2 +- .../model/basic/mapsuper/TestMapSuperEquals.java | 2 +- .../model/basic/xtra/TestDeleteUnloadedChildren.java | 2 +- .../xtra/TestInsertBatchThenFlushThenUpdate.java | 4 ++-- .../model/basic/xtra/TestInsertBatchThenUpdate.java | 4 ++-- .../xtra/TestInsertBatchWithDifferentRootTypes.java | 4 ++-- .../model/bridge/TestExplicitM2MBridgeTable.java | 2 +- .../org/tests/model/bridge/TestIdClassScalar.java | 2 +- .../carwheeltruck/TestInheritSoftDeleteJoin.java | 2 +- .../carwheeltruck/TestMTOInheritNoDiscriminator.java | 2 +- .../carwheeltruck/TestTruckCarWheelInhertiance.java | 2 +- .../model/composite/TestCompositeKeyUserClient.java | 2 +- .../tests/model/elementcollection/EcmPersonTest.java | 2 +- .../tests/model/elementcollection/EcsPersonTest.java | 2 +- .../TestElementCollectionBasic.java | 2 +- .../TestElementCollectionBasicCache.java | 2 +- .../TestElementCollectionBasicMap.java | 2 +- .../TestElementCollectionBasicMapAsLob.java | 2 +- .../TestElementCollectionBasicMapCache.java | 2 +- .../TestElementCollectionBasicSet.java | 2 +- .../TestElementCollectionCascade.java | 2 +- .../TestElementCollectionCascadeMultiple.java | 2 +- .../TestElementCollectionEmbeddedList.java | 2 +- .../TestElementCollectionEmbeddedListCache.java | 2 +- .../TestElementCollectionEmbeddedListCache2.java | 2 +- .../TestElementCollectionEmbeddedMap.java | 2 +- .../TestElementCollectionEmbeddedMapCache.java | 2 +- .../TestElementCollectionEnumSet.java | 2 +- .../TestElementCollectionResused.java | 2 +- .../model/embedded/TestEmbeddedAttrOverride.java | 2 +- .../tests/model/embedded/TestEmbeddedManyToOne.java | 2 +- .../model/embedded/TestEmbeddedNullableOverride.java | 2 +- .../tests/model/history/TestHistoryEmbeddedId.java | 4 ++-- .../org/tests/model/history/TestHistoryExclude.java | 4 ++-- .../org/tests/model/history/TestHistoryInclude.java | 4 ++-- .../tests/model/history/TestHistoryOneToMany.java | 4 ++-- .../model/history/TestHistorySoftDeleteOneToOne.java | 2 +- .../test/TestInheritExposeDtype.java | 2 +- .../inheritmany/TestMediaInheritanceJoinToMany.java | 2 +- .../org/tests/model/interfaces/TestSelfMany.java | 2 +- .../org/tests/model/interfaces/TestTargetEntity.java | 2 +- .../tests/model/ivo/test/TestAttributeConverter.java | 2 +- .../org/tests/model/joda/TestJodaInsertUpdate.java | 2 +- .../org/tests/model/json/TestJacksonPlainBean.java | 2 +- .../lazywithcache/TestWithCacheAndLazyLoad.java | 2 +- .../org/tests/model/lazywithid/TestColumnIdName.java | 2 +- .../java/org/tests/model/m2m/TestM2MWithWhere.java | 2 +- .../java/org/tests/model/m2o/TestManyToOneAsOne.java | 4 ++-- .../test/java/org/tests/model/nofk/Test2NoFk.java | 2 +- .../src/test/java/org/tests/model/nofk/TestNoFk.java | 2 +- .../org/tests/model/noid/TestInsertNoIdBean.java | 2 +- .../model/onetoone/TestOneToOneCascadeSave.java | 2 +- .../model/onetoone/TestOneToOneImportedPkNative.java | 2 +- .../tests/model/onetoone/TestOneToOneJoinColumn.java | 2 +- .../onetoone/TestOneToOneOptionalRelationship.java | 2 +- .../model/onetoone/TestOneToOneOrphanRemove.java | 4 ++-- .../model/onetoone/TestOneToOneOrphanStringId.java | 2 +- .../model/onetoone/TestOneToOnePrimaryKeyJoin.java | 2 +- .../onetoone/TestOneToOnePrimaryKeyJoinBidi.java | 2 +- .../onetoone/TestOneToOnePrimaryKeyJoinOptional.java | 2 +- .../model/onetoone/TestOneToOneSoftDeleteChild.java | 2 +- .../onetoone/album/DeleteById_SoftDelete_Tests.java | 2 +- .../model/onetoone/album/TestOneToOneHardDelete.java | 2 +- .../model/orphanremoval/TestOrphanRemoveO2M.java | 2 +- .../model/orphanremoval/TestOrphanRemoveO2MFlat.java | 2 +- .../org/tests/model/prnt/TestPrinterStateIssue.java | 2 +- .../test/java/org/tests/model/pview/TestPview.java | 2 +- .../tests/model/selfref/TestResourceFileSelfRef.java | 2 +- .../org/tests/model/selfref/TestSelfRefExample.java | 2 +- .../org/tests/model/selfref/TestTextJsonSelfRef.java | 2 +- .../java/org/tests/model/site/TestTreeModel.java | 2 +- .../org/tests/model/survey/TestOrderByFetch.java | 2 +- .../tests/model/tevent/TestAssocOneNullTraverse.java | 2 +- .../version/TestVersionHierarchyModification.java | 2 +- .../org/tests/model/view/TestViewBaseEntity.java | 2 +- .../test/java/org/tests/model/zero/TestWithZero.java | 2 +- .../java/org/tests/o2m/TestOneToManyEnhancement.java | 2 +- .../java/org/tests/o2m/TestOneToManyNoMappedBy.java | 2 +- .../java/org/tests/o2m/TestOneToManyOnlyBean.java | 2 +- .../test/java/org/tests/o2m/TestOneToManyWhere.java | 2 +- .../tests/o2m/jointable/TestOneToManyJoinTable.java | 2 +- .../jointable/TestOneToManyJoinTableInheritance.java | 2 +- .../jointable/TestOneToManyJoinTableNoTableName.java | 2 +- .../java/org/tests/o2m/lazy/TestLazyManyViaPath.java | 2 +- .../TestPersistenceContextOnUpdateDuringTxn.java | 2 +- .../TestPersistenceContextQueryScope.java | 2 +- .../TestPersistenceContextScopeUsingOrders.java | 2 +- .../TestPersistenceContextServerConfig.java | 1 + .../query/TestAddOrderByWithFirstRowsMaxRows.java | 2 +- .../org/tests/query/TestAutofetchTuneWithJoin.java | 2 +- .../org/tests/query/TestConnectionCloseOnSqlerr.java | 2 +- .../java/org/tests/query/TestDefaultFetchLazy.java | 2 +- .../org/tests/query/TestExprNestedDisjunction.java | 2 +- .../java/org/tests/query/TestFindOneOrEmpty.java | 2 +- .../src/test/java/org/tests/query/TestIContains.java | 1 + .../query/TestImplicitJoinOnParentRelationship.java | 2 +- .../java/org/tests/query/TestInvalidFetchPath.java | 2 +- .../java/org/tests/query/TestJoinOptOneCascade.java | 2 +- .../org/tests/query/TestLimitAlterFetchMany.java | 2 +- .../test/java/org/tests/query/TestLimitQuery.java | 2 +- .../test/java/org/tests/query/TestManyWhereJoin.java | 2 +- .../java/org/tests/query/TestManyWhereJoinM2M.java | 2 +- .../java/org/tests/query/TestMyAdHocSqlSelect.java | 1 + .../tests/query/TestOneToManyCorrectGrouping.java | 2 +- .../src/test/java/org/tests/query/TestOuterJoin.java | 2 +- .../test/java/org/tests/query/TestQueryAlias.java | 4 ++-- .../java/org/tests/query/TestQueryBaseTable.java | 4 ++-- .../test/java/org/tests/query/TestQueryExists.java | 2 +- .../org/tests/query/TestQueryFetchJoinWithOrder.java | 2 +- .../org/tests/query/TestQueryFetchManyTwoDeep.java | 2 +- .../java/org/tests/query/TestQueryFetchSkipPath.java | 2 +- .../tests/query/TestQueryFilterCaseInsensitive.java | 2 +- .../java/org/tests/query/TestQueryFilterMany.java | 2 +- .../org/tests/query/TestQueryFilterManyOnM2M.java | 2 +- .../tests/query/TestQueryFilterManyOnSecondary.java | 2 +- .../org/tests/query/TestQueryFilterManySimple.java | 2 +- .../test/java/org/tests/query/TestQueryFindEach.java | 2 +- .../java/org/tests/query/TestQueryFindEachWhile.java | 2 +- .../org/tests/query/TestQueryFindFutureList.java | 2 +- .../java/org/tests/query/TestQueryFindIterate.java | 4 ++-- .../org/tests/query/TestQueryFindMapTypedKey.java | 2 +- .../java/org/tests/query/TestQueryFindNative.java | 2 +- .../java/org/tests/query/TestQueryFindPagedList.java | 2 +- .../java/org/tests/query/TestQueryFindReadOnly.java | 2 +- .../java/org/tests/query/TestQueryFindStream.java | 2 +- .../java/org/tests/query/TestQueryInAssocOne.java | 2 +- .../org/tests/query/TestQueryInIdTypeConversion.java | 2 +- .../test/java/org/tests/query/TestQueryIsNull.java | 2 +- .../java/org/tests/query/TestQueryJoinBatchSize.java | 2 +- .../org/tests/query/TestQueryJoinMulipleMany.java | 2 +- .../org/tests/query/TestQueryMultiJoinFetchPath.java | 2 +- .../org/tests/query/TestQueryMultiManyOrder.java | 2 +- .../java/org/tests/query/TestQueryNullAssocOne.java | 2 +- .../java/org/tests/query/TestQueryOrderById.java | 2 +- .../org/tests/query/TestQueryPathJoinAndOrder.java | 2 +- .../org/tests/query/TestQueryPlanCacheRowCount.java | 2 +- .../java/org/tests/query/TestRefToLazyLoadMany.java | 2 +- .../src/test/java/org/tests/query/TestRowCount.java | 2 +- .../src/test/java/org/tests/query/TestSubQuery.java | 2 +- .../org/tests/query/TestThreeLevelQueryJoin.java | 2 +- .../src/test/java/org/tests/query/TestWhereIn.java | 2 +- .../java/org/tests/query/TestWhereRawClause.java | 4 ++-- .../query/aggregation/TestAggregationCount.java | 2 +- .../tests/query/autotune/TestAutoTuneProfiling.java | 2 +- .../java/org/tests/query/cache/TestDistinct.java | 2 +- .../org/tests/query/cancel/SqlQueryCancelTest.java | 3 ++- .../TestFilteringByEmbeddedInJoinedTable.java | 2 +- .../query/embedded/TestMultipleEmbeddedLoading.java | 2 +- .../org/tests/query/finder/TestCustomerFinder.java | 4 ++-- .../query/joins/TestDisjunctWhereOuterJoin.java | 2 +- .../query/joins/TestDisjunctWhereOuterOnMany.java | 2 +- .../tests/query/joins/TestQueryJoinManyNonRoot.java | 2 +- .../tests/query/joins/TestQueryJoinOnFormula.java | 2 +- .../tests/query/joins/TestQueryJoinQueryNonRoot.java | 2 +- .../joins/TestQueryManyToOneWhereClauseJoin.java | 2 +- .../tests/query/lazy/TestQueryDefaultBatchSize.java | 2 +- .../org/tests/query/orderby/TestOrderByClear.java | 2 +- .../tests/query/orderby/TestOrderByOnComplex.java | 2 +- .../tests/query/orderby/TestOrderByWithDistinct.java | 4 ++-- .../query/orderby/TestOrderByWithDistinctTake2.java | 2 +- .../tests/query/orderby/TestOrderByWithFunction.java | 2 +- .../org/tests/query/orderby/TestOrderByWithMany.java | 2 +- .../org/tests/query/other/TestFetchPreference.java | 2 +- .../query/other/TestFindIdsWithInheritance.java | 2 +- .../tests/query/other/TestFindIterateHeapDump.java | 2 +- .../TestFindPartialWithConstructorSetFields.java | 2 +- .../tests/query/other/TestFormulaWithFindCount.java | 2 +- .../tests/query/other/TestManyLazyLoadingQuery.java | 2 +- .../tests/query/other/TestManyToManyLazyLoading.java | 2 +- .../org/tests/query/other/TestOneToManyAsMap.java | 2 +- .../query/other/TestQueryConversationRowCount.java | 2 +- .../org/tests/query/other/TestQueryDistinct.java | 2 +- .../query/other/TestQueryRawExpressionMany.java | 2 +- .../tests/query/other/TestQueryRowCountWithMany.java | 2 +- .../tests/query/other/TestQuerySingleAttribute.java | 1 + .../java/org/tests/query/other/TestSelfParent.java | 2 +- .../org/tests/query/other/TestSubQueryBinding.java | 1 + .../org/tests/query/other/TestWhereAnnotation.java | 2 +- .../tests/query/other/TestWhereLikeWithSlash.java | 2 +- .../java/org/tests/query/sqlquery/SqlQueryTests.java | 3 ++- .../query/sqlquery/TestNativeILikeExpression.java | 2 +- .../quotedidentifier/TestQuotedIdentifierQuery.java | 2 +- .../java/org/tests/rawsql/TestInsertSqlLogging.java | 2 +- .../java/org/tests/rawsql/TestOrderReportTotal.java | 1 + .../java/org/tests/rawsql/TestRawSqlAsKeyword.java | 1 + .../tests/rawsql/TestRawSqlCustomerAggregate.java | 1 + .../org/tests/rawsql/TestRawSqlMasterDetail.java | 2 +- .../java/org/tests/rawsql/TestRawSqlNamedParams.java | 3 ++- .../java/org/tests/rawsql/TestRawSqlOrmQuery.java | 3 ++- .../org/tests/rawsql/TestRawSqlOrmQueryDistinct.java | 1 + .../java/org/tests/rawsql/TestRawSqlOrmWrapper.java | 1 + .../java/org/tests/rawsql/TestRawSqlOrmWrapper2.java | 1 + .../java/org/tests/rawsql/TestRawSqlOrmWrapper3.java | 2 +- .../org/tests/rawsql/TestRawSqlPositionedParams.java | 2 +- .../org/tests/rawsql/TestRawSqlUnparsedQuery.java | 2 +- .../org/tests/rawsql/TestRawSqlWithResultSet.java | 1 + .../org/tests/rawsql/inherit/ParentQueryTest.java | 2 +- .../org/tests/rawsql/inherit/ParentRawSqlTest.java | 2 +- .../tests/rawsql/nativesql/TestNativeSqlBasic.java | 4 ++-- .../rawsql/nativesql/TestNativeWithEmbedded.java | 2 +- .../test/java/org/tests/readaudit/TestReadAudit.java | 2 +- .../org/tests/repository/TestBeanRepository.java | 2 +- .../tests/saveassociation/TestSaveAssociation.java | 2 +- .../org/tests/saveassociation/TestSaveSamePK.java | 2 +- .../singleTableInheritance/TestInheritQuery.java | 2 +- .../org/tests/softdelete/TestSoftDeleteBasic.java | 1 + .../org/tests/softdelete/TestSoftDeleteBook.java | 2 +- .../tests/softdelete/TestSoftDeleteManyToMany.java | 2 +- .../TestSoftDeleteOptionalRelationship.java | 2 +- .../tests/softdelete/TestSoftDeleteOtoCascade.java | 2 +- .../softdelete/TestSoftDeleteStatelessUpdate.java | 2 +- .../java/org/tests/softdelete/TestSoftDeleteTop.java | 2 +- .../java/org/tests/sp/TestManyToManySaveTwice.java | 2 +- .../java/org/tests/test/TestInheritWithMany.java | 2 +- .../org/tests/text/csv/TestTimeStringParser.java | 2 +- .../tests/text/json/TestJsonBeanDescriptorParse.java | 2 +- .../tests/text/json/TestJsonBeanWithTimeZone.java | 2 +- .../text/json/TestJsonInheritanceDiscriminator.java | 2 +- .../test/java/org/tests/text/json/TestJsonMap.java | 2 +- .../java/org/tests/text/json/TestJsonSimple.java | 2 +- .../text/json/TestJsonSomeEnumWithToString.java | 2 +- .../tests/text/json/TestTextJsonBeanReadVisitor.java | 2 +- .../tests/text/json/TestTextJsonCompoundType.java | 2 +- .../org/tests/text/json/TestTextJsonInheritance.java | 2 +- .../tests/text/json/TestTextJsonInsertUpdate.java | 2 +- .../org/tests/text/json/TestTextJsonInvokeLazy.java | 2 +- .../text/json/TestTextJsonReadManyLazyLoad.java | 2 +- .../tests/text/json/TestTextJsonReferenceBean.java | 2 +- .../java/org/tests/text/json/TestTextJsonSimple.java | 2 +- .../org/tests/text/json/TestTextJsonSuperSimple.java | 2 +- .../org/tests/transaction/TestBatchModelFlush.java | 2 +- .../tests/transaction/TestBatchPersistCascade.java | 4 ++-- .../org/tests/transaction/TestBeanStateReset.java | 2 +- .../TestBeginTransactionWithExisting.java | 2 +- .../org/tests/transaction/TestCommitAndContinue.java | 4 ++-- .../TestCreateTransactionWithIsolation.java | 2 +- .../TestDeleteFromPersistenceContext.java | 2 +- .../org/tests/transaction/TestExecuteComplete.java | 3 ++- .../org/tests/transaction/TestInsertManyAndRef.java | 2 +- .../test/java/org/tests/transaction/TestNested.java | 2 +- .../tests/transaction/TestNestedBeginRequired.java | 1 + .../TestNestedBeginRequiredWithFailure.java | 1 + .../transaction/TestNestedBeginRequiresNew.java | 1 + .../TestNestedBeginRequiresNewWithFailure.java | 1 + .../org/tests/transaction/TestNestedMandatory.java | 2 +- .../tests/transaction/TestNestedSubTransaction.java | 3 ++- .../org/tests/transaction/TestNestedTransaction.java | 2 +- .../tests/transaction/TestPersistContextClear.java | 2 +- .../java/org/tests/transaction/TestSavepoint.java | 4 ++-- .../org/tests/transaction/TestSqlServerBatch.java | 4 ++-- .../transaction/TestStatelessUpdateClearPC.java | 2 +- .../tests/transaction/TestTransactionCallback.java | 2 +- .../tests/transaction/TestTransactionSkipCache.java | 2 +- .../transaction/TestTransactionTryResources.java | 4 ++-- .../tests/transaction/TestTransactionalNever.java | 2 +- .../transaction/TestTransactionalNotSupports.java | 2 +- .../tests/transaction/TestTransactionalReadOnly.java | 2 +- .../tests/transaction/TestTransactionalRequired.java | 2 +- .../transaction/TestTransactionalRequiresNew.java | 1 + .../tests/transaction/TestTransactionalSupports.java | 2 +- .../transparentpersist/TestTransparentPersist.java | 1 + .../java/org/tests/types/TestEncryptedString.java | 2 +- .../src/test/java/org/tests/types/TestFileType.java | 2 +- .../java/org/tests/types/TestFileTypeFetching.java | 2 +- .../src/test/java/org/tests/types/TestHstore.java | 2 +- .../src/test/java/org/tests/types/TestNewTypes.java | 2 +- .../test/java/org/tests/types/TestPeriodType.java | 2 +- .../org/tests/unidirectional/TestUniDirectional.java | 2 +- .../org/tests/unitinternal/TestEqualsOnEnhanced.java | 2 +- .../tests/unitinternal/TestNullCollectionSet.java | 2 +- .../org/tests/unitinternal/TestOrderByParse.java | 2 +- .../unitinternal/TestTxTypeOnTransactional.java | 2 +- .../tests/unitinternal/TestVanillaCollectionSet.java | 2 +- .../org/tests/update/TestEmbeddedRefreshUpdate.java | 2 +- .../org/tests/update/TestJsonStatelessUpdate.java | 2 +- .../test/java/org/tests/update/TestMarkAsDirty.java | 2 +- .../java/org/tests/update/TestPostgresTruncate.java | 2 +- .../java/org/tests/update/TestSqlUpdateBatch.java | 2 +- .../tests/update/TestSqlUpdateBindMultipleLists.java | 2 +- .../org/tests/update/TestSqlUpdateExceptions.java | 1 + .../java/org/tests/update/TestSqlUpdateInTxn.java | 2 +- .../java/org/tests/update/TestSqlUpdateUpsert.java | 6 +++--- .../tests/update/TestUpdateAllLoadedProperties.java | 2 +- .../org/tests/update/TestUpdateCircularSave.java | 2 +- .../java/org/tests/update/TestUpdatePartial.java | 2 +- .../org/tests/update/TestUpdatePartialNoVer.java | 2 +- 603 files changed, 689 insertions(+), 640 deletions(-) rename ebean-test/src/test/java/io/ebean/{ => xtest}/BaseTestCase.java (99%) rename ebean-test/src/test/java/io/ebean/{annotation => xtest}/ForPlatform.java (85%) rename ebean-test/src/test/java/io/ebean/{annotation => xtest}/IgnorePlatform.java (86%) diff --git a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java index eb94870d9..bdd2546b9 100644 --- a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java +++ b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java @@ -1,6 +1,7 @@ package io.ebean; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index 21e28d2a3..3621affd0 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -1,7 +1,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.etest.BSimpleFor; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/BaseTestCase.java rename to ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java index 139e49e26..059cdae68 100644 --- a/ebean-test/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest; +import io.ebean.*; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java b/ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java similarity index 85% rename from ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java rename to ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java index a69c42e9a..43b66cdf9 100644 --- a/ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java +++ b/ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java @@ -1,4 +1,6 @@ -package io.ebean.annotation; +package io.ebean.xtest; + +import io.ebean.annotation.Platform; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java b/ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java similarity index 86% rename from ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java rename to ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java index 6fafc4852..ac3eb488a 100644 --- a/ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java +++ b/ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java @@ -1,4 +1,6 @@ -package io.ebean.annotation; +package io.ebean.xtest; + +import io.ebean.annotation.Platform; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java index 36f667956..8b86e635c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DtoQuery; import io.ebean.QueryIterator; import io.ebean.meta.BasicMetricVisitor; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java index a54f4dd24..101e8a370 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java @@ -1,10 +1,10 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DtoQuery; import io.ebean.ProfileLocation; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaTimedMetric; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java index 26b32bd05..4717fabf4 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java @@ -1,10 +1,10 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DtoQuery; import io.ebean.SqlRow; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java index c263240f0..33d9a4f8d 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.*; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java index 54d9fd45b..a8db827a3 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java index 5bc087199..2f1fa3a13 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java index 39c9e2469..e719fdfe8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index 6c5927d21..e41d914b9 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java index f0aa638b7..1bf75ad6b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java index e285b3849..602a046c0 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java @@ -1,6 +1,7 @@ package io.ebean.xtest.base; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java index 76925f4e3..010d6460c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.FetchGroup; import io.ebean.Query; import io.ebean.service.SpiFetchGroupQuery; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java index eada8ae2d..3a6983f40 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java @@ -1,8 +1,8 @@ package io.ebean.xtest.base; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ExecutionCondition; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java index bac0f7aaf..f44d7a37d 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java index 1a3892a46..ecae57e76 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.ValuePair; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java index 756dfdfa8..feb625990 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Filter; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java index 4f1f01e60..024b7951b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java @@ -1,9 +1,9 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java index 13be5bbc7..225888156 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java index 62ee44b5b..1b44e44b2 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java @@ -1,8 +1,9 @@ package io.ebean.xtest.base; import io.ebean.*; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; diff --git a/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java index e4a22bed4..dfed8b276 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.bean; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index bdeb926e8..a1a4adae8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -3,7 +3,7 @@ package io.ebean.xtest.config; import io.ebean.Database; import io.ebean.DatabaseFactory; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java index 699bd5566..e98a66368 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java @@ -1,6 +1,6 @@ package io.ebean.xtest.config; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.TableName; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java index 35ad4aa4f..38ae7f3d8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java @@ -1,8 +1,8 @@ package io.ebean.xtest.config.dbplatform; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index eefbd9138..a2ffd5f7c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -1,8 +1,8 @@ package io.ebean.xtest.config.dbplatform.sqlserver; import io.ebean.BackgroundExecutor; -import io.ebean.BaseTestCase; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.sqlserver.SqlServerStepSequence; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java index 212c41bb5..2625d992c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java @@ -1,7 +1,7 @@ package io.ebean.xtest.docstore; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Query; import io.ebean.docstore.DocUpdateContext; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java index 8869c6f69..33b275f02 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.event; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.bean.BeanCollection; diff --git a/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java index b463129cd..a4a8ec6e0 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java @@ -4,6 +4,7 @@ package io.ebean.xtest.event; import io.ebean.*; import io.ebean.config.DatabaseConfig; import io.ebean.event.BeanPostLoad; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 7f8c2231a..81a382ce8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.cluster.binarymessage; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.EbeanServer; import io.ebean.xtest.internal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java index 97f71318a..399cf70de 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java @@ -1,7 +1,7 @@ package io.ebean.xtest.internal.server.executor; import io.ebean.BackgroundExecutor; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java index 366b5ec6a..73128d908 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java @@ -1,10 +1,10 @@ package io.ebean.xtest.internal.server.grammer; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebeaninternal.api.SpiQuery; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java index 3cd0582fc..5508d7f99 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.lib; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DatabaseFactory; import io.ebean.event.ShutdownManager; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java index 6c110457b..3c7caa12e 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.query.LimitOffsetPagedList; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java index bd44347c7..27663c6f3 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java @@ -1,6 +1,7 @@ package io.ebean.xtest.internal.server.query; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.server.query.QueryFutureIds; import io.ebeaninternal.server.query.QueryFutureList; import io.ebeaninternal.server.query.QueryFutureRowCount; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java index 5af99b4ef..816ada0c8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java @@ -1,7 +1,8 @@ package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; import io.ebeaninternal.server.core.DefaultServer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java index faaf7638d..e11a0f991 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java @@ -1,7 +1,8 @@ package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java index 880c62c7e..2c66288c7 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteBeanVisitor; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java index 825b0bf1d..72efba9d1 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java index 0e6a66f31..f2fd8cf62 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -1,7 +1,8 @@ package io.ebean.xtest.internal.server.transaction; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiTransaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java index e7f70f66c..0229250b7 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TxScope; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java index 6d104dc70..25d4d839b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java index 3da9db351..9c4cfdc0c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java @@ -1,7 +1,7 @@ package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonParser; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.PersistenceContext; import io.ebean.text.json.JsonBeanReader; diff --git a/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java index cc3bec462..e5669c2dc 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.plugin; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.plugin.BeanType; diff --git a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java index 620e9ab20..379b5bd92 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java +++ b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java @@ -1,6 +1,6 @@ package io.ebean.xtest.text; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java index 51115c8c3..e2412d08b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -1,7 +1,8 @@ package io.ebeaninternal.dbmigration; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DbHistorySupport; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 4bcb40b8e..886a05618 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index cd6114904..1469e4fb2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 08988cfce..b4804b97a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 86bab509f..88828f78b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index 75d0a673f..d45c249fc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.event.changelog.ChangeSet; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index d639abf65..c1b1536ad 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.event.changelog.ChangeLogFilter; import org.junit.jupiter.api.Test; import org.tests.inheritance.model.ProductConfiguration; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index b600aefc9..d4dd8f389 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index a7dbc0165..28f058595 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index 5a91d0416..03c82cde0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ValuePair; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 6b3371bfb..2a7018e52 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ValuePair; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index 382397c9b..14cc5208c 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.plugin.Property; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index 063a7a515..e4c4620c3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 3407b37be..21296cabf 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index eadc01968..cc966accc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java index 76462d577..f81eb37b0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java index 71b888046..11b61ad06 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index 112fcf345..72bfccdde 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 406dbd2ef..de8dbdadc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index 6ad4e5ba0..22a4eb8f0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index f835cc427..b1e661220 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index b2d302848..d271374ac 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 551db2d8e..c8b4ac78a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index ef44734b8..4f8bed0c7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.EbeanServer; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index db93edf36..9f6d3ebf6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index 58e33b9d2..125c2ac21 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index a4499ae96..260b5bb76 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.loadcontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.FetchConfig; import io.ebean.Query; import io.ebeaninternal.server.core.OrmQueryRequest; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index 305e7694b..f4a6d421a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.querydefn; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebeaninternal.api.BindValuesKey; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 189fd4457..31849f1e4 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java index b96c190f7..abf0d9d49 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 74c4fcd7a..00c9be698 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.EncryptKey; import org.junit.jupiter.api.Test; import org.tests.basic.encrypt.BasicEncryptKey; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index 61f9bfb69..309a00604 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.core.type.DataReader; diff --git a/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java index 81e25b80a..64a6ddf4d 100644 --- a/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java @@ -1,8 +1,8 @@ package org.etest; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.test.ForTests; diff --git a/ebean-test/src/test/java/org/etest/ForTestsTest.java b/ebean-test/src/test/java/org/etest/ForTestsTest.java index c475ecfce..27466814a 100644 --- a/ebean-test/src/test/java/org/etest/ForTestsTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsTest.java @@ -1,9 +1,9 @@ package org.etest; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.test.ForTests; diff --git a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 4e962ae92..a70a4cc35 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -1,6 +1,6 @@ package org.multitenant.partition; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 97f66b7c6..a1dca6a5d 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -1,8 +1,8 @@ package org.tests.aggregateformula; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java index f7f9a3df7..e3289c3f1 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java @@ -1,6 +1,6 @@ package org.tests.aggregateformula; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 547483ceb..034088063 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.annotation.Index; import io.ebean.annotation.Platform; import io.ebean.annotation.Where; diff --git a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index d32d86d4c..1ab8abc7a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java index a619cebce..257b40d74 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java index efe924f85..1e3cbab52 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 74e2441a5..c0c397e6c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java index 4365d4860..1993ebe25 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -1,8 +1,8 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.EDefaultProp; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java index eabcbb380..9e15fd49d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index b873d3be6..7fa911e93 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java index a31a70666..2b29e4554 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index 18ba4d2ab..215b53757 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 824f6bca3..8ce9b3a5d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TMapSuperEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java index 3b049591b..1174f7a34 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; diff --git a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 35c137540..44a6c4e21 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java index 97b057392..43af42479 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java index afc456e04..9ac6d72e1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java index 2ebc4dab4..00fb02252 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index b493a23e7..eb1ce3daf 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java index a42667b7d..6b2fe71b5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java index c4b12d8e7..ebc134ff2 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java index 30b98d23b..c5ed8b008 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.core.type.ScalarType; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java index 70a2290c1..f25109973 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java index 2bf0d083a..4ecea59b1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 6db645e15..71a9b0bed 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.CacheMode; import io.ebean.DB; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java index 8d7eb92f0..63183c7db 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index 920b94ed5..249a2d0b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java index 884571f8e..5d02724f1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java index 5722ffbbb..f3dc340dc 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java index 1f4e09106..4aaa4c704 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java index 10591aa09..f08304c90 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java index 7f601523a..c8a374302 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java index 6c6f34fa1..f4670d2ea 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TMapSuperEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index 13073c583..e7c84da15 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -1,8 +1,8 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java index 3a9079788..cee656644 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java index 030d4e3a4..881c37b39 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonUpdPropEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 2d8263759..84a42b683 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java index 4de0887c7..265f55e3f 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java @@ -1,6 +1,7 @@ package org.tests.basic; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java index 2f647ac38..59c0bc0a8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 82788d8a0..6312cfcf8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebeaninternal.api.SpiPersistenceContext; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index 89217ca7a..cb45cac51 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -1,7 +1,8 @@ package org.tests.basic; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index a014c8b86..71631a880 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -1,8 +1,8 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java index 3ea035b32..67191e6bb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java @@ -1,9 +1,9 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java index ef755a30d..5c72400fc 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java index 03579c200..bd4cc3e27 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java index 63dec52d1..1a038e7f3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index c9b687fae..9c018a160 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 2d8ad58b4..efb948bc8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index d32899dfb..af899d8c0 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index bf98a2d00..6869eb2b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java index 9edd48cac..cc19b522a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-test/src/test/java/org/tests/basic/TestTransient.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestUpdate.java index c4274bfc5..d7973ca59 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUpdate.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Update; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java index c00635678..7bc4d26d4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java index 95cfce6d1..0caabf977 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TUuidEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 1c554e093..1642b2821 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 99197ac98..cb4ad2fd3 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -1,6 +1,6 @@ package org.tests.basic.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 17af48c3c..706b80b9f 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -1,6 +1,6 @@ package org.tests.basic.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java index 5a101c208..ee5a5f8a5 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java @@ -1,6 +1,6 @@ package org.tests.basic.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index ea2e2de5c..9998c1669 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -1,10 +1,10 @@ package org.tests.basic.encrypt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 6c26ee0fe..e5a5f5875 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -1,6 +1,6 @@ package org.tests.basic.encrypt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java index ff941438b..c67514cc5 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java @@ -1,6 +1,6 @@ package org.tests.basic.encrypt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptClient; diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index 8b86b1f87..e1dc3ffb7 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -1,7 +1,7 @@ package org.tests.basic.event; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TWithPreInsert; diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java index f6050a161..3a5985092 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -1,6 +1,6 @@ package org.tests.basic.event; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryType; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 9068b760a..ee0fe55bd 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -1,6 +1,6 @@ package org.tests.basic.lob; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index 5a2274e49..49f12151d 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -1,6 +1,6 @@ package org.tests.basic.lob; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java index 092924ed1..06f61ec10 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -1,6 +1,6 @@ package org.tests.basic.lob; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TBytesOnly; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index ab4f0c4ba..54b5f1b7c 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java index 2ec4a3d96..59fdff226 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java index 0ebacbde6..040b48bca 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index d5ee6435a..ff8806b25 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ESomeType; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index 5229806e5..53eb722b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java index 1578462a2..fb175a714 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java b/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java index 7ee4ca9a9..fb38d7b45 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 7c100ec0b..0ba734092 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -1,7 +1,8 @@ package org.tests.batchinsert; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index b8c041f5b..03102a19c 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -1,9 +1,9 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index a4da626c3..e0aa7c908 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -1,6 +1,6 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index cc41e4933..c639cd563 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -1,9 +1,9 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiTransaction; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index 7495f8560..52cc783b8 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -1,9 +1,9 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java index dfca84655..9c1787dd4 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java index f017ae3ee..20ae99766 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 879fb1097..64028f220 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index dbb650815..5648911aa 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java index 69033d33c..0fb8417d1 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java index c2b797bb7..abc40f017 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java index 8dd286907..c607988a2 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java index 79a1daaf7..081255343 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 6766cfe9a..5783e0fb9 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 0eabc9570..28001fb8a 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index deae22962..5c0c2d2d3 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java index 64a88e1f1..219dc18e2 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 03386f656..3a4eeb675 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index ac0127398..f6b1c3eae 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java index f36936807..16c38fa30 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java index 059fd9a6d..15b25cd85 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.DatabaseFactory; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java index 617737c52..b0ec1decd 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 069287b91..965e6eddd 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index c7a45d5e6..e00da156b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FetchGroup; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java index 59e54d538..3bc534c66 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 4f22cff59..fd6696f4b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -3,6 +3,7 @@ package org.tests.cache; import io.ebean.*; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.server.cache.CachedManyIds; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java index 829d07279..fd0ed06aa 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java index 02c220f3b..5a6d0c59a 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java index ce511ea58..ddb3d6fde 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index a71f52130..b69276295 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java index 225a7ac38..9a95f93a3 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedInhChildA; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java index 1da96116a..faf7cbe01 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java index a6a52c38b..7607795a9 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index 0655ae4c4..7cd366356 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index c65383dc0..866a801df 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java index fdeb6f30d..ff0dfe4de 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.cache.M2MCacheChild; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index 5a5b06fc0..7b0949b42 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.ExpressionList; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java index bafb239eb..34f51511b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 292a361af..a8b51f43b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index 8f08e776c..c5296a413 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -1,6 +1,7 @@ package org.tests.cache; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 2fce790b7..e08d10209 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java index 3434c48eb..85d69f8df 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java @@ -1,6 +1,6 @@ package org.tests.cache.personinfo; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java index 6ead0106b..e9913ea4b 100644 --- a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -1,6 +1,6 @@ package org.tests.callable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CallableSql; import io.ebean.DB; import io.ebean.Database; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java b/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java index 5468657b0..318534d3c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java index 324774d01..2f9f62b26 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java index c1eca9d9b..0bd494f19 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 94cc8b6f7..79a6cbc32 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java index 1fecd07d9..3f6cab760 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java index f567928e3..c88f318e5 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index 66f14e982..e7ac4868c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 376389835..986e28b1f 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java index ebc6fe9bc..020cf066c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index f265bf341..e1d5f19df 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java index 02b03ad73..34e3a330b 100644 --- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java @@ -2,7 +2,7 @@ package org.tests.changelog; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.ChangeLog; diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java index 48d855918..b4c6a823d 100644 --- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java +++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java @@ -1,6 +1,6 @@ package org.tests.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java index eeb66a5e4..b6507998d 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index 4545424d2..6de92d46d 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 26db614db..d2f208296 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index bcaf57f4a..bdf3e673c 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.CaoBean; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java index 6004c8762..35192da76 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index fe904adfb..0df82645c 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CountDistinctOrder; import io.ebean.DB; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 9a90095bf..69cf085ec 100644 --- a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -1,6 +1,6 @@ package org.tests.contructor; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; diff --git a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java index 8986ba8e8..ef3c8d600 100644 --- a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -1,8 +1,8 @@ package org.tests.ddl; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java index 9822a68ff..d0efdec30 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -1,6 +1,6 @@ package org.tests.defaultvalues; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index dc563f1a2..45293bc52 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.onetoone.Account; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java index d773c010e..7015923b3 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java index 7d01a60d8..51f172493 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -1,7 +1,8 @@ package org.tests.delete; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index 1b24ee419..6412c63f6 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index ff6dd9c33..f5831c1f0 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java index ecea5c295..1dc65930a 100644 --- a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -1,7 +1,7 @@ package org.tests.docstore; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index f21d12225..def5d2374 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -1,6 +1,6 @@ package org.tests.draftable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/el/TestELBasic.java b/ebean-test/src/test/java/org/tests/el/TestELBasic.java index 9fd4d619b..8743e7e4d 100644 --- a/ebean-test/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-test/src/test/java/org/tests/el/TestELBasic.java @@ -1,6 +1,6 @@ package org.tests.el; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.*; diff --git a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java index 2646707e6..1f06b3759 100644 --- a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -1,6 +1,6 @@ package org.tests.el; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index 1360c1cb6..ead52dbe0 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -1,6 +1,6 @@ package org.tests.enhancement; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index ac4adb358..fc3bca361 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -1,6 +1,6 @@ package org.tests.enhancement; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java b/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java index 515d45e73..61fa85168 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java @@ -1,6 +1,6 @@ package org.tests.enhancement; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; diff --git a/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java index 01d89b277..5a269dec8 100644 --- a/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java +++ b/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java @@ -1,6 +1,6 @@ package org.tests.expression.bitwise; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/family/TestInheritance.java b/ebean-test/src/test/java/org/tests/family/TestInheritance.java index 485428b79..58e3d81a3 100644 --- a/ebean-test/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-test/src/test/java/org/tests/family/TestInheritance.java @@ -1,8 +1,8 @@ package org.tests.family; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java index c44fea1fa..ced209f8b 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -1,6 +1,6 @@ package org.tests.generated; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.EGenProps; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java index 53ba7cb1b..53c8c6a6f 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -1,6 +1,6 @@ package org.tests.generated; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.xtest.base.MyCurrentUserProvider; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java index 5f2b96fb3..c74cc749a 100644 --- a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -1,6 +1,6 @@ package org.tests.genkey; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java index 5039ad72e..b4c50cecf 100644 --- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java @@ -1,7 +1,8 @@ package org.tests.history; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java index 4ad721274..2abfd3e9a 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java @@ -1,7 +1,7 @@ package org.tests.idkeys; import io.avaje.moduuid.ModUUID; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ECustomId; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index 8f57569a0..470469d41 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -1,8 +1,8 @@ package org.tests.idkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Transaction; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.api.SpiEbeanServer; @@ -26,7 +26,7 @@ public class TestGeneratedKeys extends BaseTestCase { @ForPlatform(Platform.H2) // readSequenceValue is H2 specific public void testGenKeySeqA() throws SQLException { assumeTrue(idType() == IdType.SEQUENCE); - + SpiEbeanServer server = spiEbeanServer(); try (Transaction tx = server.beginTransaction()) { @@ -46,7 +46,7 @@ public class TestGeneratedKeys extends BaseTestCase { } } - + @Test @ForPlatform(Platform.H2) // readSequenceValue is H2 specific public void testGenKeySeqB() throws SQLException { @@ -89,7 +89,7 @@ public class TestGeneratedKeys extends BaseTestCase { case MARIADB : throw new UnsupportedOperationException("reading sequence value outside of the current connection is not supported. " + "See https://mariadb.com/kb/en/previous-value-for-sequence_name/#description"); - + default : throw new UnsupportedOperationException("reading sequence value from " + spiEbeanServer().databasePlatform().getPlatform() @@ -126,7 +126,7 @@ public class TestGeneratedKeys extends BaseTestCase { assertNotNull(al.getId()); } } - + @Test @ForPlatform({Platform.H2, Platform.MARIADB, Platform.SQLSERVER, Platform.DB2}) public void testGeneratedKeys() throws SQLException { diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java index e6b2fbad8..f8504d26d 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.idkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java index 6627cd81f..b869f9cf9 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java @@ -1,6 +1,6 @@ package org.tests.idkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java index 5a5036721..b4567c25e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.AttributeHolder; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java index 6dbe29216..e393235c0 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java index a0875a694..bb3323cf3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index deb32300f..ad6517297 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 1be175266..8ccc74fb5 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index 57e36f9f6..295180236 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index dec3ecb53..82e3116f9 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java index 6cbb1945f..5deb85db5 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index a041117ac..9716392d3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java index a67d6a764..dcb546a90 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TIntChild; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java index e365002fc..41911e06b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java index 3f9f870ed..3a8ffef16 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index b9391055c..d042bb01c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java index 8e9e2a6aa..8c6d61d80 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java @@ -1,6 +1,6 @@ package org.tests.inheritance.abstrakt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index 40c75b695..80a8910a7 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index aea64c388..7cee2dab1 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index d341db918..569141191 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java index b11abf5ed..2ede7296e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java index 5f0a31039..176748edc 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.plugin.Property; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java index 773bffb02..4160b9bc5 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index 1794098e6..35f0bf271 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -1,9 +1,9 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DataIntegrityException; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index 8682874dc..4ffa8f8e9 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DuplicateKeyException; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 436f2e6b4..9704b2045 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.orderentity.OrderEntity; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java b/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java index e2c1b9ebc..148931fad 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java index b33391c5b..3dd1e128e 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java @@ -1,9 +1,9 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java index 6407aa046..cbd4f1f26 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java +++ b/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java index 51b1fe382..b90c9cc57 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java index b86cc5e5c..4ad61cff3 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.info.InfoCompany; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 3741a2d55..b4df0d011 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java index 48e72585b..4b45d4a3c 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java index 6aeaa4a37..cc9c9b5e9 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java @@ -1,7 +1,7 @@ package org.tests.iud; import io.avaje.moduuid.ModUUID; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java index 25302f8e1..47fbfdc58 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -1,7 +1,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java index 52a176dd3..ca067d1b0 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -1,7 +1,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson2; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java index ff9c3216c..b5a540838 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -1,10 +1,10 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.ValuePair; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index ce84f08b3..27434601e 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -1,8 +1,8 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebean.text.TextException; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index 39971b716..bb1b87602 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -1,9 +1,9 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebean.text.json.EJson; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java index d73f27625..431a80c70 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java index c87ad37f4..102c661d1 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java index 66e28b5f9..782fc90da 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java index 551040e72..82d5acee9 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java index 77bdfbb1c..bd289c7fc 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java index 0e349ff26..0e697054b 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonNodeBlob; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java index f863981f6..ea3b19816 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonNodeJsonB; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java index c2de2026a..c4a225f8d 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonNodeVarchar; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java index 593e19080..bdc27c210 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicOldValue; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java b/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java index 9a2d5d6ca..201c00220 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java @@ -3,7 +3,7 @@ package org.tests.json; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.ValuePair; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.MutationDetection; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; diff --git a/ebean-test/src/test/java/org/tests/json/TestOldValue.java b/ebean-test/src/test/java/org/tests/json/TestOldValue.java index 63a7cda22..476793d04 100644 --- a/ebean-test/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-test/src/test/java/org/tests/json/TestOldValue.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ValuePair; import org.assertj.core.api.SoftAssertions; diff --git a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java index 4ab61389b..e9eea9c1c 100644 --- a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonUnmapped; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 7fb3fcc05..f88f14829 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -1,6 +1,6 @@ package org.tests.lazyforeignkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; @@ -87,7 +87,7 @@ public class TestLazyForeignKeys extends BaseTestCase { assertFalse(rel1.getEntity1().isDeleted()); assertTrue(rel1.getEntity2().isDeleted()); } - + @Test public void testGetWithDbForeignKey() { MainEntityRelation relation = DB.find(MainEntityRelation.class).findOne(); @@ -95,9 +95,9 @@ public class TestLazyForeignKeys extends BaseTestCase { cat.setId(123L); relation.setCat(cat); DB.save(relation); - + relation = DB.find(MainEntityRelation.class).findOne(); - + assertNotNull(relation.getCat()); } } diff --git a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java index 73675df63..5973dcf7d 100644 --- a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -1,6 +1,6 @@ package org.tests.level.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.level.Level1; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 9700a1229..8fba76f4b 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -1,6 +1,6 @@ package org.tests.lifecycle; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 48efd17ec..07491fa1f 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -1,6 +1,6 @@ package org.tests.lifecycle; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithLifecycleExceptions; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java index 67841cff6..adbac28c2 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java @@ -1,6 +1,6 @@ package org.tests.lifecycle; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicLog; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java index 12f2f9806..4a1b8653b 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index 415f56c97..a90ce7ea0 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -1,9 +1,9 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index b60af0b06..462e9b8c4 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index 6d996c61c..be65dcc09 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index cf10512cd..327aa8e87 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -1,8 +1,8 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java index 7089bedca..dc31662ab 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index 425ae3812..afbc2440f 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MailBox; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 0cd6ca95d..2cee8aeba 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyTopic; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java index c7b3d1f5b..8afd1e5cd 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.meta.MetaTimedMetric; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java index c8fe1498b..7f681b81b 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java @@ -1,6 +1,6 @@ package org.tests.m2m.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java index 5ab159089..d52266cb3 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java @@ -1,6 +1,6 @@ package org.tests.merge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index 43928257d..51de98fa5 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -3,6 +3,7 @@ package org.tests.merge; import io.ebean.*; import io.ebean.test.LoggedSql; import io.ebean.text.PathProperties; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java index 4974bfae1..5e0cfc1fa 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java @@ -1,6 +1,6 @@ package org.tests.merge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java index 9660d7530..dda574872 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java index d8c7fea17..da8b1ffd8 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 8a2cb9911..63856d085 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -1,9 +1,9 @@ package org.tests.model.array; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java index 7352a5bd5..8d413c34c 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -1,8 +1,9 @@ package org.tests.model.array; import io.ebean.*; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 5bfaa970d..b3fa88307 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 3f2090dd0..6a97a95ea 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.Pairs; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 0f4a902c3..c3848ca5a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java index ac34b2fce..46541c223 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java index 674b060c4..6e73f72c4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java index ba6a16ac2..9ebba0d92 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java index 8a4b17d12..47847b9db 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java index 7dff5caf5..798148684 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java @@ -1,6 +1,6 @@ package org.tests.model.basic.mapsuper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index 6b553e01a..1734be563 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -1,6 +1,6 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index 9b9b13028..23a8020cc 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -1,9 +1,9 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index ba3a75ffb..f757beedf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -1,9 +1,9 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index 5f1e23178..3b7a18da9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -1,9 +1,9 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java index 201339bdc..4c2d594c7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index 2cedcc84d..fe9eebfb3 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java index 772d12c5b..faec8244e 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java index 9f6052b9a..3032ff45f 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index 18ed6d523..9803ed934 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 57b3bf6d8..d2e67f631 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index b3b505068..a296baabf 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index 44bd1d576..7c624dfcd 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 6524d0e7f..590d0d796 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 3fa8ac694..36c45e538 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 366ad5570..0bf01e2e2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index af02d2a26..f37b231c3 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index fef7fb95e..0516f19f8 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 65359a683..36bb4c28f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java index 7d949d94a..d3904838a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index 0278dd465..003c721a4 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 1c19069c6..508c84156 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 6b5c62b3b..9aef4c029 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java index ea6d47d90..44fa51e7b 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index 18912a254..0c9ab75a0 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 3c1802e78..96fa04c78 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java index e60921867..27d856347 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java index 2c55ceae4..057f5283a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index fe1c32cb4..a0360cb23 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 52462c880..19362dffb 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java index f6f636c1e..390678212 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java index 029100f3e..45070451d 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java @@ -1,10 +1,10 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ValuePair; import io.ebean.Version; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java index 64a5c54a8..9107beae3 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java @@ -1,8 +1,8 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java index f1122447b..5e305f5d4 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java @@ -1,8 +1,8 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java index b5c0c43d4..7278d8cf4 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java @@ -1,8 +1,8 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java index 6ac425f71..9456ef49e 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java @@ -1,6 +1,6 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index 395f99a13..8364ccc16 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -1,6 +1,6 @@ package org.tests.model.inheritexposedtype.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.inheritexposedtype.IXPhoto; diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index 181d9af22..02ba0dc68 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java index ec164715d..1d2415ca4 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java index 974d7aeef..aa7030ef1 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java index 57a4d97ad..8ab723908 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java @@ -1,6 +1,6 @@ package org.tests.model.ivo.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.ivo.ESomeConvertType; diff --git a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index 127eb6162..ae3598aac 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -1,6 +1,6 @@ package org.tests.model.joda; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index e84d82dc3..b0927c7ba 100644 --- a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -1,6 +1,6 @@ package org.tests.model.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java index 39ac73ded..70aa27e7a 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.model.lazywithcache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java index 6c1f8ea58..9f4fb068a 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java @@ -1,6 +1,6 @@ package org.tests.model.lazywithid; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index a6449bbca..d9ac37ffc 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java index 269e9dd57..94702038f 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java @@ -1,8 +1,8 @@ package org.tests.model.m2o; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index f93459556..aeda58f12 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -1,6 +1,6 @@ package org.tests.model.nofk; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index a13b0cdff..66f85692c 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -1,6 +1,6 @@ package org.tests.model.nofk; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java index bc4b7c94a..dbd1d01ae 100644 --- a/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java +++ b/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java @@ -1,6 +1,6 @@ package org.tests.model.noid; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index 088d98c9d..01c31249c 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 8d7d33e66..122e298e9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java index 70db66096..98914f2af 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index 15d390821..3db11f94e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index a15ba6a15..780564b83 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 14051b5e4..698a17dc7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index 6662c5033..2a90c5670 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index b010f5b4b..81e8905ed 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 0ea4c16d1..39cbfa730 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java index d19da3abc..6f5d648a0 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index c4612e613..6da1a4ecd 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone.album; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 98c4acbe7..b408d4dc9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone.album; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index d888f0c62..8712ce8f3 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -1,6 +1,6 @@ package org.tests.model.orphanremoval; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java index cce4380c9..57a06789e 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java @@ -1,6 +1,6 @@ package org.tests.model.orphanremoval; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index 0ad676aa6..f2b903e38 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/pview/TestPview.java b/ebean-test/src/test/java/org/tests/model/pview/TestPview.java index 72d885173..0bddc3e79 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/TestPview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/TestPview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java index e7c3d42e5..a384a3794 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index f99d5d6de..256fe5634 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index 5715204c5..6ca62e534 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java index b133061c6..9dc6df3e2 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java @@ -1,6 +1,6 @@ package org.tests.model.site; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java index ec3cbba19..cdb3b7b23 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java +++ b/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java index 4b74ceb75..cd7116a56 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java @@ -1,6 +1,6 @@ package org.tests.model.tevent; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java index b318e643f..51d00ca8c 100644 --- a/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java +++ b/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java index 5f91694b1..d57ce95b9 100644 --- a/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java +++ b/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java @@ -1,6 +1,6 @@ package org.tests.model.view; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java index 71a87432b..c5a25fe35 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java index be1936e6a..3c708d8d1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.common.BeanList; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMap; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java index 47e2eff50..fc6b2f613 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index c1d7b40b6..91031a3d6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java index 77d85654b..aac83b7b2 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 0d035fbd5..5c295e5ea 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index 9413f6cfd..818bf8b85 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.config.dbplatform.IdType; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index ee58d1964..792d58e2b 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java b/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java index e94d21fa9..dd675a67e 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index aa4971107..f858739db 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -1,6 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index 235976ee4..56988bc4b 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -1,6 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index 81aed21f8..3ea926b29 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -1,6 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index 67fc1d549..b066c01a2 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -3,6 +3,7 @@ package org.tests.persistencecontext; import io.ebean.*; import io.ebean.config.ContainerConfig; import io.ebean.config.DatabaseConfig; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index c3c5fb7c0..23ca117d1 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index 52a3dd791..7b1307c6f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.ObjectGraphNode; diff --git a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index d12e052ff..e009b8866 100644 --- a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java index 0328af33f..0fefc767c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java index ec5e64686..aa8830f25 100644 --- a/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java +++ b/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java index a03386c2e..777c503ff 100644 --- a/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java +++ b/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestIContains.java b/ebean-test/src/test/java/org/tests/query/TestIContains.java index c014aace4..d7fdf6634 100644 --- a/ebean-test/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-test/src/test/java/org/tests/query/TestIContains.java @@ -2,6 +2,7 @@ package org.tests.query; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java index 402b6dc99..59f198f78 100644 --- a/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java index fd96088ba..2557d1782 100644 --- a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java index 2991df135..ba2939160 100644 --- a/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java +++ b/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java index 80d7d6c0d..d2979f723 100644 --- a/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java index 52442979c..fd897f99b 100644 --- a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java index b2b38c42e..3cacc5208 100644 --- a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java index 3d6eb76cb..4d0ef4c24 100644 --- a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java +++ b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 0b51c347d..40959a361 100644 --- a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -1,6 +1,7 @@ package org.tests.query; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MyAdHoc; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 50723dc9b..701286b7f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java index d1834ddc0..f75b426bc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java index e9470dbd8..42ffbe458 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java @@ -1,9 +1,9 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java index 2f5a32b28..7ddb1e1c2 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -1,8 +1,8 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java index 58fc9f412..6dcbd34bd 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index bec162c9a..7df6843c7 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index aa1592787..3a861a271 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index cf840ba25..b45003fa1 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java index c7ac0311f..1cc3a7f52 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java index 0d8830797..ebc02064d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index f47d9da52..55690536e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MUser; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index de9b567df..91b88453e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java index 7864838ff..c9af3e2ce 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index 9dce80a77..95bebbe25 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java index d444d54e0..416da9611 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java index 2a05cb16d..01b9a0e76 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FutureList; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index fa884feb2..59307d83c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -1,10 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryIterator; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourcePool; import io.ebean.plugin.SpiServer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java index e1e091f15..d2aefb407 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java index b3c229f71..58b49c22e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.PagedList; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 580f821dc..73ccb1c33 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java index 78be3b140..6a08a74ef 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java index 63a6c5c8f..b53276d40 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java index 77a3088cc..e30859f24 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java b/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java index 72a6d98a5..7e30448e0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java index f93a9e450..faf97ab53 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index fa478dd20..d1de92e43 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index 171df676f..bdbddebea 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java index 4f439a58e..90868a9da 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index a67aaec76..3b433de83 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java index c48c11f87..1fde35127 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java index 579c1dfd0..5f3ace76a 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index 1d41c026e..b7910ee4f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index fb1fac598..16feef8be 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index 5b0e4c931..0739c2801 100644 --- a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/query/TestRowCount.java b/ebean-test/src/test/java/org/tests/query/TestRowCount.java index 0d3f215c8..627b9e883 100644 --- a/ebean-test/src/test/java/org/tests/query/TestRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/TestRowCount.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java index 1f868508b..a63c91115 100644 --- a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java +++ b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index 8b2ed0939..3a79e6bc1 100644 --- a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereIn.java b/ebean-test/src/test/java/org/tests/query/TestWhereIn.java index f6c4162d4..727df61fc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereIn.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereIn.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java index ebb5ce146..7c2b36603 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java @@ -1,10 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 09e9c5b1e..8636d48d6 100644 --- a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -1,6 +1,6 @@ package org.tests.query.aggregation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 2595c5bfb..676beb2b7 100644 --- a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -1,6 +1,6 @@ package org.tests.query.autotune; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java index 4dc9702fe..a84897d41 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index eb065149e..5bdc8b186 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -1,7 +1,8 @@ package org.tests.query.cancel; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java index 9b449cf4d..fd49fa5af 100644 --- a/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java +++ b/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java @@ -1,6 +1,6 @@ package org.tests.query.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 9291cde2e..1bdb21ab3 100644 --- a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -1,6 +1,6 @@ package org.tests.query.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 7903adb9c..8b0273424 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -1,9 +1,9 @@ package org.tests.query.finder; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.meta.*; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java index 840b3b46f..4b1e18e03 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java index b6b8d394d..beb554945 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index c67d875a1..9a50964bc 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index d790e99c9..81eb2cfc1 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index 7d417f1ed..f09155462 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index 76e5952d0..1801c2dcf 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index ade9da0e7..65e00a180 100644 --- a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -1,6 +1,6 @@ package org.tests.query.lazy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java index 6d09bf18c..c0b7bfd7e 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.OrderBy; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java index 1c223c3ce..f2ef12851 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index 673aa0363..8e6d13893 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -1,9 +1,9 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index 66832db7e..8d559f67f 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index b85867d7f..24e3664ea 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 9a399d344..028b80d2d 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java index 37a09cb7a..5ca68c42e 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index 9ca47f36c..b387006a1 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Truck; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index cc2a58594..aa34c2a95 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -1,7 +1,7 @@ package org.tests.query.other; import com.sun.management.HotSpotDiagnosticMXBean; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 7ea317f94..5dedb9955 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index 1109e3043..c5d792e97 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ExpressionList; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index c0f3deff8..cbbba65dd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index 052165d16..e53c1e891 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java index 71b49dc82..b1a53208c 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.map.MpRole; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index ffd7c8527..b445073b8 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java index 5786658a2..5045186cd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 153e3c120..391ba4f50 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index bca8d203a..1f689e123 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 69d6ffa59..df9d0f3b0 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -1,6 +1,7 @@ package org.tests.query.other; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java index 483b85998..9aa5c761a 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.selfref.SelfParent; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java index c3eb3a2bd..0340e05ce 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -1,6 +1,7 @@ package org.tests.query.other; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java index 0f52d3dac..a3b587575 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java index e637d2411..b6603a2f2 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 485a741c3..fd3768090 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -1,7 +1,8 @@ package org.tests.query.sqlquery; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index 66e9ce6bd..c201582c7 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -1,6 +1,6 @@ package org.tests.query.sqlquery; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java index f30d1ba60..abc91b65d 100644 --- a/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java +++ b/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java @@ -1,6 +1,6 @@ package org.tests.quotedidentifier; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.BWithQIdent; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index f4c4c26b7..cdfc0af5b 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index c6c541de7..624f5df6b 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 9b9540003..03c03c5fd 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index d61d4c8e4..10f1b558a 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.CustomerAggregate; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index dcc81e2da..b749db38e 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index e40fe30bd..17cf86356 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -1,7 +1,8 @@ package org.tests.rawsql; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 154395bba..441100133 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,7 +1,8 @@ package org.tests.rawsql; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 9e834e98f..5bce462f1 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index aa8048769..51c785250 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 8e477055c..d961ecf53 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 404b12861..0658320be 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java index 6444593e6..c4af99d58 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java index 61942668e..b3b04229d 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 59a2bfa81..88f2c2aaa 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index 5e45b8130..30b004bad 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -1,6 +1,6 @@ package org.tests.rawsql.inherit; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index 0369ba346..cb8662d1e 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -1,6 +1,6 @@ package org.tests.rawsql.inherit; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index b34bfd55a..a86a07f21 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -1,10 +1,10 @@ package org.tests.rawsql.nativesql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java index 991f66724..9b85e8cf2 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java @@ -1,6 +1,6 @@ package org.tests.rawsql.nativesql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java index 2b1a2740d..3cf98812d 100644 --- a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -1,6 +1,6 @@ package org.tests.readaudit; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.FutureList; diff --git a/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java b/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java index f09823412..633bf0483 100644 --- a/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java +++ b/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java @@ -1,6 +1,6 @@ package org.tests.repository; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java index d7e9fc8ba..41ae6c338 100644 --- a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java +++ b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java @@ -1,6 +1,6 @@ package org.tests.saveassociation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java index 4229cbf65..a646e9e49 100644 --- a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java +++ b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java @@ -1,6 +1,6 @@ package org.tests.saveassociation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index 061475a40..6010d0bfb 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.singleTableInheritance.model.*; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 8642a67aa..f3d5389a8 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -2,6 +2,7 @@ package org.tests.softdelete; import io.ebean.*; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; import org.tests.model.softdelete.EBasicSDChild; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 992ada21a..9f573f653 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 45d44dd82..ccf74c663 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index a3aee96d6..bada81f07 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Finder; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index d150d9712..efff3fe5e 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index a8d548ebe..54b93195f 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java index c34b75ef8..6a8889fbf 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index 17a211de7..80656a5e0 100644 --- a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -1,6 +1,6 @@ package org.tests.sp; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java index 7b510e858..02bd9d1d8 100644 --- a/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java @@ -1,6 +1,6 @@ package org.tests.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java index 3aea61ade..5f05cab76 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java @@ -1,6 +1,6 @@ package org.tests.text.csv; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.text.TimeStringParser; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index ddd05f05c..6edefc417 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -1,7 +1,7 @@ package org.tests.text.json; import com.fasterxml.jackson.core.JsonParser; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java index f07c31d65..a69fd5a3b 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java index 19ac15925..faac7e127 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java index c955939d5..c35068932 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java index d0bf62f9c..c44957fc6 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index 08f171196..7baba2633 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java index 2d1d5df3a..00fa481cd 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java index 00dbae51a..cea12e239 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java @@ -4,7 +4,7 @@ package org.tests.text.json; // //import org.junit.Assert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; // diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 5c1f02cd3..6f2fc22f1 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java index 70feaf335..f799e7de9 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.util.StringHelper; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index bc7ff3251..e51bdeff8 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java index c73264234..33ea392f1 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index d140b46d7..7f1173216 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java index 3f4da80e7..754ffd87d 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.text.PathProperties; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java index f0f41ba10..e0b026ded 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 639b52c69..7018883a8 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index 7f575924a..3181d8456 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -1,10 +1,10 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index 2fcb01543..cdcf7bbdc 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index 2e0d05ef9..74e480340 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.TxIsolation; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java index e8197fc33..ea532fbd2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java @@ -1,10 +1,10 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java index aff263bbd..4c9cdc21c 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; public class TestCreateTransactionWithIsolation extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index a4b4ee099..936babbd2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java index be3b6557b..2b95e9d6f 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -1,7 +1,8 @@ package org.tests.transaction; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index ecab276e9..632fbdb77 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmark; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java index 1993c90be..c34688083 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNested.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index 58b4c68c5..03a08863a 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 6f91cf2fd..ffe5ff162 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index ca6b62bc7..b71e1fee3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index 927d3380a..776ad72b9 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java index a1409cd32..7d1d3acd7 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index 44e8f7299..e8f32eced 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -1,7 +1,8 @@ package org.tests.transaction; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java index 5bc880902..b2bf41825 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java index 7b993e92d..06e2cb826 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java index 1ba7ffe01..e890b4e9e 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java @@ -1,9 +1,9 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java index 18174625e..fb1b0a8c3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java @@ -1,9 +1,9 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index 946fcda03..d03fcea7f 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java index 3135fa42f..4edd37ae9 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index fab0b3eb3..4e2d15159 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java index e2511c543..dce5451ec 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -1,10 +1,10 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DuplicateKeyException; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java index f6bf776a8..3ae5e80d2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index b530252f8..bc59408ca 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java index 2c8156ccb..9b20104eb 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java index a3c367dc3..4b48f682c 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 3e38e2d0c..37a8760ed 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -3,6 +3,7 @@ package org.tests.transaction; import io.ebean.*; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java index 53b55b6bb..bf881b878 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 74c3f3efb..52c323884 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -4,6 +4,7 @@ import io.ebean.*; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxOption; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java index 4fdeaea07..7d078179a 100644 --- a/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java +++ b/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestFileType.java b/ebean-test/src/test/java/org/tests/types/TestFileType.java index 39dc9e528..28e1e02a5 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileType.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java index 6518e2919..e529a065a 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java index e852a6955..5f93c332d 100644 --- a/ebean-test/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-test/src/test/java/org/tests/types/TestHstore.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.assertj.core.api.Assertions; diff --git a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java index 90ffd842a..81dd15433 100644 --- a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; diff --git a/ebean-test/src/test/java/org/tests/types/TestPeriodType.java b/ebean-test/src/test/java/org/tests/types/TestPeriodType.java index e398e85bb..3717ed66d 100644 --- a/ebean-test/src/test/java/org/tests/types/TestPeriodType.java +++ b/ebean-test/src/test/java/org/tests/types/TestPeriodType.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.types.SomePeriodBean; diff --git a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java index daa493385..8b3ebb317 100644 --- a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -1,6 +1,6 @@ package org.tests.unidirectional; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index 915df69e0..c0bb5750f 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index 668be5317..f4ab59e0e 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 3f65621b6..4fb45fef6 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.OrderBy; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index fcfcb5aef..f078d2b9d 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index c580d23cf..daa5fe60e 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 3bc09dae3..4bb232bbf 100644 --- a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; diff --git a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index 009283e11..3e9d7cd79 100644 --- a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; diff --git a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java index 49d6f7222..bc74fca70 100644 --- a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java index f8d32bcca..5b3798cab 100644 --- a/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java +++ b/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; public class TestPostgresTruncate extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java index cd06f3711..cf66e6753 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index 1c05bed7f..17631f371 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index 0aad43977..333380318 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -1,6 +1,7 @@ package org.tests.update; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index 13d72c689..ccbfc084b 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index ffa1bd26b..7dbf7c5ab 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -1,9 +1,9 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestSqlUpdateUpsert extends BaseTestCase { private static boolean useV1Syntax = Boolean.getBoolean("ebean.h2.useV1Syntax"); - + @ForPlatform(Platform.H2) @Test public void h2Merge() throws InterruptedException { diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 416e6f974..1b06ca0f1 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java index cfdd8b1cf..cbb0fe697 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java index e4fecaed8..cfc7e5b43 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index 0af27a760..19e572df4 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic;