[hibernate-commits] Hibernate SVN: r19910 - in core/trunk: annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a and 221 other directories.

Author: steve.ebersole(a)jboss.com Date: 2010-07-07 15:39:23 -0400 (Wed, 07 Jul 2010) New Revision: 19910 Added: core/trunk/testing/src/main/java/org/hibernate/testing/ core/trunk/testing/src/main/java/org/hibernate/testing/cache/ core/trunk/testing/src/main/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.java core/trunk/testing/src/main/java/org/hibernate/testing/cache/VersionedItem.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/ core/trunk/testing/src/main/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipLog.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/TestSuiteVisitor.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/UnitTestCase.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java core/trunk/testing/src/main/java/org/hibernate/testing/tm/ core/trunk/testing/src/main/java/org/hibernate/testing/tm/ConnectionProviderImpl.java core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java core/trunk/testing/src/main/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java core/trunk/testing/src/main/java/org/hibernate/testing/tm/package.html Removed: core/trunk/testing/src/main/java/org/hibernate/junit/ core/trunk/testing/src/main/java/org/hibernate/test/annotations/ core/trunk/testing/src/main/java/org/hibernate/test/cache/ core/trunk/testing/src/main/java/org/hibernate/test/tm/ Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/TextTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java core/trunk/cache-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java core/trunk/testsuite/src/test/java/org/hibernate/jdbc/GeneralWorkTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/FailureExpectedCollector.java core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/array/ArrayTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/ReflectionOptimizerTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/RefreshTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ListenerTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/original/CollectionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java core/trunk/testsuite/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/component/Dom4jComponentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/extralazy/ExtraLazyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/EJBQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/id/UseIdentifierRollbackTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idbag/IdBagTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idclass/IdClassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ImmutableTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/importfile/ImportFileTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java core/trunk/testsuite/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/iterate/IterateTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/join/JoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/fetch/FetchingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lazycache/InstrumentCacheTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCProxyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJ2Test.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/StatisticsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/BlobLocatorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ClobLocatorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ImageTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongByteArrayTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongStringTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedBlobTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedClobTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/lob/TextTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/map/MapIndexFormulaTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/mappingexception/MappingExceptionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/DeleteTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java core/trunk/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ops/DeleteTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ordered/OrderByTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/OrphanTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/PropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sorted/SortTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/stats/SessionStatsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/stats/StatsTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/subselect/SubselectTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/ternary/TernaryTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/timestamp/TimestampTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/typeparameters/TypeParameterTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/unconstrained/UnconstrainedTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/unidir/BackrefTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/basic/UserCollectionTypeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/util/StringHelperTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/version/VersionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/version/db/DbVersionTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java core/trunk/testsuite/src/test/java/org/hibernate/test/where/WhereTest.java core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/ConfigurationPerformanceTest.java core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewPerformanceTest.java core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewerPerformanceTest.java core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/PerformanceTest.java core/trunk/testsuite/src/test/unmaintained/org/hibernate/test/tool/TestSchemaTools.java Log: HHH-5357 - Rename hibernate-testing packages Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,6 +33,7 @@ import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.testing.junit.functional.annotations.HibernateTestCase; /** * A base class for all annotation tests. Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,7 +1,6 @@ package org.hibernate.test.annotations.derivedidentities.e6.a; import org.hibernate.Session; -import org.hibernate.junit.FailureExpected; import org.hibernate.test.annotations.TestCase; import org.hibernate.test.util.SchemaUtil; Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.FailureExpected; +import org.hibernate.testing.junit.FailureExpected; import org.hibernate.test.annotations.TestCase; /** Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -28,8 +28,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.DialectChecks; -import org.hibernate.junit.RequiresDialectFeature; +import org.hibernate.testing.junit.DialectChecks; +import org.hibernate.testing.junit.RequiresDialectFeature; import org.hibernate.mapping.Column; import org.hibernate.test.annotations.TestCase; import org.hibernate.test.annotations.id.sequences.entities.Ball; Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/idclass/xml/IdClassXmlTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -22,7 +22,7 @@ */ package org.hibernate.test.annotations.idclass.xml; -import org.hibernate.junit.FailureExpected; +import org.hibernate.testing.junit.FailureExpected; import org.hibernate.test.annotations.TestCase; /** Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -12,7 +12,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.RequiresDialect; +import org.hibernate.testing.junit.RequiresDialect; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Column; import org.hibernate.test.annotations.TestCase; Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -32,7 +32,7 @@ import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.junit.RequiresDialect; +import org.hibernate.testing.junit.RequiresDialect; import org.hibernate.test.annotations.TestCase; import org.hibernate.util.ArrayHelper; Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/LobTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,8 +26,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.DialectChecks; -import org.hibernate.junit.RequiresDialectFeature; +import org.hibernate.testing.junit.DialectChecks; +import org.hibernate.testing.junit.RequiresDialectFeature; import org.hibernate.test.annotations.TestCase; /** Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/TextTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/TextTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/lob/TextTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -32,7 +32,7 @@ import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.junit.RequiresDialect; +import org.hibernate.testing.junit.RequiresDialect; import org.hibernate.test.annotations.TestCase; import org.hibernate.util.ArrayHelper; Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,8 +27,8 @@ import java.math.BigDecimal; import org.hibernate.Session; -import org.hibernate.junit.DialectChecks; -import org.hibernate.junit.RequiresDialectFeature; +import org.hibernate.testing.junit.DialectChecks; +import org.hibernate.testing.junit.RequiresDialectFeature; import org.hibernate.test.annotations.TestCase; /** Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/manytoonewithformula/ManyToOneWithFormulaTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,7 +29,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.SkipForDialect; +import org.hibernate.testing.junit.SkipForDialect; import org.hibernate.test.annotations.TestCase; /** Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.FailureExpected; +import org.hibernate.testing.junit.FailureExpected; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; Modified: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ package org.hibernate.test.annotations.xml.hbm; import org.hibernate.Session; -import org.hibernate.junit.DialectChecks; -import org.hibernate.junit.RequiresDialectFeature; +import org.hibernate.testing.junit.DialectChecks; +import org.hibernate.testing.junit.RequiresDialectFeature; import org.hibernate.test.annotations.TestCase; /** Modified: core/trunk/cache-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java =================================================================== --- core/trunk/cache-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-ehcache/src/test/java/org/hibernate/cache/EhCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,8 +26,8 @@ import junit.framework.Test; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.test.cache.BaseCacheProviderTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.cache.BaseCacheProviderTestCase; /** * @author Emmanuel Bernard Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java =================================================================== --- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import org.hibernate.cache.RegionFactory; import org.hibernate.cache.infinispan.util.CacheHelper; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.cache.infinispan.util.CacheTestSupport; import org.infinispan.Cache; import org.slf4j.Logger; Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java =================================================================== --- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,7 +10,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.connection.ConnectionProvider; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; import org.hibernate.transaction.CMTTransactionFactory; Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java =================================================================== --- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -35,7 +35,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.classic.Session; import org.hibernate.connection.ConnectionProvider; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.test.cache.infinispan.functional.Contact; import org.hibernate.test.cache.infinispan.functional.Customer; Modified: core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java =================================================================== --- core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,8 +27,8 @@ import org.hibernate.cfg.Mappings; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.junit.functional.ExecutionEnvironment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.ExecutionEnvironment; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.transaction.CMTTransactionFactory; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/AbstractJBossCacheTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,8 +29,9 @@ import org.hibernate.cache.RegionFactory; import org.hibernate.cache.jbc.util.CacheHelper; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.util.CacheTestSupport; + import org.jboss.cache.Cache; import org.jboss.cache.Node; import org.slf4j.Logger; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/CacheTestCaseBase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,10 @@ import org.hibernate.cfg.Environment; import org.hibernate.cfg.Mappings; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.tm.ConnectionProviderImpl; +import org.hibernate.testing.tm.TransactionManagerLookupImpl; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,11 +112,11 @@ protected abstract boolean getUseQueryCache(); protected Class<?> getConnectionProviderClass() { - return org.hibernate.test.tm.ConnectionProviderImpl.class; + return ConnectionProviderImpl.class; } protected Class<?> getTransactionManagerLookupClass() { - return org.hibernate.test.tm.TransactionManagerLookupImpl.class; + return TransactionManagerLookupImpl.class; } protected Class<?> getTransactionFactoryClass() { Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/DualNodeTestCaseBase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -20,7 +20,7 @@ import org.hibernate.cfg.Mappings; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.junit.functional.ExecutionEnvironment; +import org.hibernate.testing.junit.functional.ExecutionEnvironment; import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl; import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl; import org.hibernate.test.cache.jbc.functional.util.DualNodeTestUtil; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCConcurrentWriteTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -43,7 +43,7 @@ import org.hibernate.cache.jbc.JBossCacheRegionFactory; import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.test.cache.jbc.functional.util.DualNodeConnectionProviderImpl; import org.hibernate.test.cache.jbc.functional.util.DualNodeJtaTransactionManagerImpl; Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/MVCCJBossCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,7 +29,7 @@ import org.hibernate.cache.jbc.JBossCacheRegionFactory; import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Basic functional test of a MVCC locking entity + query cache. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/OptimisticJBossCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,7 +29,7 @@ import org.hibernate.cache.jbc.JBossCacheRegionFactory; import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Basic functional test of a optimistic locking entity + query cache. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/PessimisticJBossCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,7 +29,7 @@ import org.hibernate.cache.jbc.JBossCacheRegionFactory; import org.hibernate.cache.jbc.builder.SharedCacheInstanceManager; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Basic functional test of a pessimistic locking entity + query cache. Modified: core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java =================================================================== --- core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/bulk/PessimisticBulkOperationsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -34,7 +34,7 @@ import org.hibernate.test.cache.jbc.functional.CacheTestCaseBase; import org.hibernate.test.cache.jbc.functional.Contact; import org.hibernate.test.cache.jbc.functional.Customer; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; import org.hibernate.transaction.CMTTransactionFactory; /** Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -44,7 +44,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.Ejb3Configuration; -import org.hibernate.test.annotations.HibernateTestCase; +import org.hibernate.testing.junit.functional.annotations.HibernateTestCase; /** * A base class for all ejb tests. Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/annotation/ConfigurationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -31,7 +31,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.Ejb3Configuration; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.mapping.PersistentClass; /** Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,7 +10,7 @@ import org.hibernate.ejb.test.Cat; import org.hibernate.ejb.test.Kitten; import org.hibernate.ejb.test.TestCase; -import org.hibernate.junit.FailureExpected; +import org.hibernate.testing.junit.FailureExpected; /** * @author Emmanuel Bernard Copied: core/trunk/testing/src/main/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/cache/BaseCacheProviderTestCase.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/cache/BaseCacheProviderTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,238 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.cache; + +import java.util.Map; + +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.cache.ReadWriteCache; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.stat.SecondLevelCacheStatistics; +import org.hibernate.stat.Statistics; +import org.hibernate.testing.tm.ConnectionProviderImpl; +import org.hibernate.testing.tm.TransactionManagerLookupImpl; +import org.hibernate.transaction.JDBCTransactionFactory; + +/** + * Common requirement testing for each {@link org.hibernate.cache.CacheProvider} impl. + * + * @author Steve Ebersole + */ +public abstract class BaseCacheProviderTestCase extends FunctionalTestCase { + + // note that a lot of the fucntionality here is intended to be used + // in creating specific tests for each CacheProvider that would extend + // from a base test case (this) for common requirement testing... + + public BaseCacheProviderTestCase(String x) { + super( x ); + } + + public String[] getMappings() { + return new String[] { "cache/Item.hbm.xml" }; + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.CACHE_REGION_PREFIX, "" ); + cfg.setProperty( Environment.USE_SECOND_LEVEL_CACHE, "true" ); + cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); + cfg.setProperty( Environment.USE_STRUCTURED_CACHE, "true" ); + cfg.setProperty( Environment.CACHE_PROVIDER, getCacheProvider().getName() ); + + if ( getConfigResourceKey() != null ) { + cfg.setProperty( getConfigResourceKey(), getConfigResourceLocation() ); + } + + if ( useTransactionManager() ) { + cfg.setProperty( Environment.CONNECTION_PROVIDER, ConnectionProviderImpl.class.getName() ); + cfg.setProperty( Environment.TRANSACTION_MANAGER_STRATEGY, TransactionManagerLookupImpl.class.getName() ); + } + else { + cfg.setProperty( Environment.TRANSACTION_STRATEGY, JDBCTransactionFactory.class.getName() ); + } + } + + /** + * The cache provider to be tested. + * + * @return The cache provider. + */ + protected abstract Class getCacheProvider(); + + /** + * For provider-specific configuration, the name of the property key the + * provider expects. + * + * @return The provider-specific config key. + */ + protected abstract String getConfigResourceKey(); + + /** + * For provider-specific configuration, the resource location of that + * config resource. + * + * @return The config resource location. + */ + protected abstract String getConfigResourceLocation(); + + /** + * Should we use a transaction manager for transaction management. + * + * @return True if we should use a RM; false otherwise. + */ + protected abstract boolean useTransactionManager(); + + + public void testQueryCacheInvalidation() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Item i = new Item(); + i.setName("widget"); + i.setDescription("A really top-quality, full-featured widget."); + s.persist(i); + t.commit(); + s.close(); + + SecondLevelCacheStatistics slcs = s.getSessionFactory().getStatistics() + .getSecondLevelCacheStatistics( Item.class.getName() ); + + assertEquals( slcs.getPutCount(), 1 ); + assertEquals( slcs.getElementCountInMemory(), 1 ); + assertEquals( slcs.getEntries().size(), 1 ); + + s = openSession(); + t = s.beginTransaction(); + i = (Item) s.get( Item.class, i.getId() ); + + assertEquals( slcs.getHitCount(), 1 ); + assertEquals( slcs.getMissCount(), 0 ); + + i.setDescription("A bog standard item"); + + t.commit(); + s.close(); + + assertEquals( slcs.getPutCount(), 2 ); + + Object entry = slcs.getEntries().get( i.getId() ); + Map map; + if ( entry instanceof ReadWriteCache.Item ) { + map = (Map) ( (ReadWriteCache.Item) entry ).getValue(); + } + else { + map = (Map) entry; + } + assertTrue( map.get("description").equals("A bog standard item") ); + assertTrue( map.get("name").equals("widget") ); + + // cleanup + s = openSession(); + t = s.beginTransaction(); + s.delete( i ); + t.commit(); + s.close(); + } + + public void testEmptySecondLevelCacheEntry() throws Exception { + getSessions().evictEntity( Item.class.getName() ); + Statistics stats = getSessions().getStatistics(); + stats.clear(); + SecondLevelCacheStatistics statistics = stats.getSecondLevelCacheStatistics( Item.class.getName() ); + Map cacheEntries = statistics.getEntries(); + assertEquals( 0, cacheEntries.size() ); + } + + public void testStaleWritesLeaveCacheConsistent() { + Session s = openSession(); + Transaction txn = s.beginTransaction(); + VersionedItem item = new VersionedItem(); + item.setName( "steve" ); + item.setDescription( "steve's item" ); + s.save( item ); + txn.commit(); + s.close(); + + Long initialVersion = item.getVersion(); + + // manually revert the version property + item.setVersion( new Long( item.getVersion().longValue() - 1 ) ); + + try { + s = openSession(); + txn = s.beginTransaction(); + s.update( item ); + txn.commit(); + s.close(); + fail( "expected stale write to fail" ); + } + catch( Throwable expected ) { + // expected behavior here + if ( txn != null ) { + try { + txn.rollback(); + } + catch( Throwable ignore ) { + } + } + } + finally { + if ( s != null && s.isOpen() ) { + try { + s.close(); + } + catch( Throwable ignore ) { + } + } + } + + // check the version value in the cache... + SecondLevelCacheStatistics slcs = sfi().getStatistics() + .getSecondLevelCacheStatistics( VersionedItem.class.getName() ); + + Object entry = slcs.getEntries().get( item.getId() ); + Long cachedVersionValue; + if ( entry instanceof ReadWriteCache.Lock ) { + //FIXME don't know what to test here + cachedVersionValue = new Long( ( (ReadWriteCache.Lock) entry).getUnlockTimestamp() ); + } + else { + cachedVersionValue = ( Long ) ( (Map) entry ).get( "_version" ); + assertEquals( initialVersion.longValue(), cachedVersionValue.longValue() ); + } + + + // cleanup + s = openSession(); + txn = s.beginTransaction(); + item = ( VersionedItem ) s.load( VersionedItem.class, item.getId() ); + s.delete( item ); + txn.commit(); + s.close(); + + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/cache/Item.hbm.xml) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors.  All third-party contributions are + ~ distributed under license by Red Hat Middleware LLC. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + --> +<hibernate-mapping + package="org.hibernate.test.cache"> + + <class name="Item" table="Items"> + <id name="id"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <property name="description" not-null="true"/> + </class> + + <class name="VersionedItem" table="VersionedItems"> + <id name="id"> + <generator class="increment"/> + </id> + <version name="version" type="long"/> + <property name="name" not-null="true"/> + <property name="description" not-null="true"/> + </class> + +</hibernate-mapping> Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.hbm.xml ___________________________________________________________________ Name: svn:executable + * Copied: core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/cache/Item.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,53 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + +package org.hibernate.testing.cache; + +/** + * @author Gavin King + */ +public class Item { + private Long id; + private String name; + private String description; + + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } +} Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/cache/Item.java ___________________________________________________________________ Name: svn:executable + * Copied: core/trunk/testing/src/main/java/org/hibernate/testing/cache/VersionedItem.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/cache/VersionedItem.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/cache/VersionedItem.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/cache/VersionedItem.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,39 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.cache; + +/** + * @author Steve Ebersole + */ +public class VersionedItem extends Item { + private Long version; + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/AbstractClassLoaderIsolatedTestCase.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/AbstractClassLoaderIsolatedTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,57 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +/** + * A specialized TestCase for running tests in an isolated class-loader + * + * @author Steve Ebersole + */ +public abstract class AbstractClassLoaderIsolatedTestCase extends UnitTestCase { + private ClassLoader parentLoader; + private ClassLoader isolatedLoader; + + public AbstractClassLoaderIsolatedTestCase(String string) { + super( string ); + } + + protected void setUp() throws Exception { + parentLoader = Thread.currentThread().getContextClassLoader(); + isolatedLoader = buildIsolatedClassLoader( parentLoader ); + Thread.currentThread().setContextClassLoader( isolatedLoader ); + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + Thread.currentThread().setContextClassLoader( parentLoader ); + releaseIsolatedClassLoader( isolatedLoader ); + parentLoader = null; + isolatedLoader = null; + } + + protected abstract ClassLoader buildIsolatedClassLoader(ClassLoader parent); + + protected abstract void releaseIsolatedClassLoader(ClassLoader isolatedLoader); +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/DialectChecks.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,59 @@ +// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import org.hibernate.dialect.Dialect; + +/** + * Container class for different implementation of the {@code DialectCheck} interface. + * + * @author Hardy Ferentschik + */ +abstract public class DialectChecks { + + abstract public boolean include(Dialect dialect); + + public static class SupportsSequences extends DialectChecks { + public boolean include(Dialect dialect) { + return dialect.supportsSequences(); + } + } + + public static class SupportsExpectedLobUsagePattern extends DialectChecks { + public boolean include(Dialect dialect) { + return dialect.supportsExpectedLobUsagePattern(); + } + } + + public static class SupportsIdentityColumns extends DialectChecks { + public boolean include(Dialect dialect) { + return dialect.supportsIdentityColumns(); + } + } + + +} + + Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/junit/DialectChecks.java ___________________________________________________________________ Name: svn:keywords + Id Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/FailureExpected.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,51 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotations used to mark a test as an expected failure. + * + * @author Hardy Ferentschik + * @author Steve Ebersole + */ +(a)Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface FailureExpected { + /** + * The key of a JIRA issue which covers this expected failure. + * @return The jira issue key + */ + String jiraKey(); + + /** + * A message explaining the reason for the expected failure. Optional. + * @return The reason + */ + String message() default ""; +} \ No newline at end of file Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/junit/FailureExpected.java ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/RequiresDialect.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,70 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.hibernate.dialect.Dialect; + +/** + * Annotation used to indicate that a test should be run only when run against the + * indicated dialects. + * + * @author Hardy Ferentschik + */ +@Target({ ElementType.METHOD, ElementType.TYPE }) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface RequiresDialect { + /** + * The dialects against which to run the test + * + * @return The dialects + */ + Class<? extends Dialect>[] value(); + + /** + * Used to indicate if the dialects should be matched strictly (classes equal) or + * non-strictly (instanceof). + * + * @return Should strict matching be used? + */ + boolean strictMatching() default false; + + /** + * Comment describing the reason why the dialect is required. + * + * @return The comment + */ + String comment() default ""; + + /** + * The key of a JIRA issue which relates this this restriction + * + * @return The jira issue key + */ + String jiraKey() default ""; +} Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialect.java ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/RequiresDialectFeature.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,59 @@ +// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation used to indicate that a test should be run only when the current dialect suppports the + * specified feature. + * + * @author Hardy Ferentschik + */ +@Target({ ElementType.METHOD, ElementType.TYPE }) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface RequiresDialectFeature { + /** + * @return The name of the dialect feature. + */ + Class<? extends DialectChecks> value(); + + /** + * Comment describing the reason why the feature is required. + * + * @return The comment + */ + String comment() default ""; + + /** + * The key of a JIRA issue which relates this this feature requirement. + * + * @return The jira issue key + */ + String jiraKey() default ""; +} \ No newline at end of file Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/junit/RequiresDialectFeature.java ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/SkipForDialect.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,68 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.hibernate.dialect.Dialect; + +/** + * Annotation used to indicate that a test should be skipped when run against the + * indicated dialects. + * + * @author Hardy Ferentschik + * @author Steve Ebersole + */ +(a)Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.METHOD, ElementType.TYPE }) +public @interface SkipForDialect { + /** + * The dialects against which to skip the test + * @return The dialects + */ + Class<? extends Dialect>[] value(); + + /** + * Used to indicate if the dialects should be matched strictly (classes equal) or + * non-strictly (instanceof). + * @return Should strict matching be used? + */ + boolean strictMatching() default false; + + /** + * Comment describing the reason for the skip. + * @return The comment + */ + String comment() default ""; + + /** + * The key of a JIRA issue which covers the reason for this skip. Eventually we should make this + * a requirement. + * @return The jira issue key + */ + String jiraKey() default ""; +} \ No newline at end of file Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipForDialect.java ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipLog.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/SkipLog.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipLog.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/SkipLog.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,36 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Well-known-location lookup for the test-skip log... + * + * @author Steve Ebersole + */ +public class SkipLog { + public static final Logger LOG = LoggerFactory.getLogger( "org.hibernate.test.SKIPPED" ); +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/TestSuiteVisitor.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/TestSuiteVisitor.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/TestSuiteVisitor.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/TestSuiteVisitor.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,65 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import java.util.Enumeration; + +import junit.framework.TestSuite; +import junit.framework.Test; + +/** + * Handles walking a TestSuite hierarchy for recognition of individual tests. + * + * @author Steve Ebersole + */ +public class TestSuiteVisitor { + + private final TestSuiteVisitor.Handler handler; + + public TestSuiteVisitor(TestSuiteVisitor.Handler handler) { + this.handler = handler; + } + + public void visit(TestSuite testSuite) { + handler.startingTestSuite( testSuite ); + Enumeration tests = testSuite.tests(); + while ( tests.hasMoreElements() ) { + Test test = ( Test ) tests.nextElement(); + if ( test instanceof TestSuite ) { + visit( ( TestSuite ) test ); + } + else { + handler.handleTestCase( test ); + } + } + handler.completedTestSuite( testSuite ); + } + + public static interface Handler { + public void handleTestCase(Test test); + public void startingTestSuite(TestSuite suite); + public void completedTestSuite(TestSuite suite); + } + +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/UnitTestCase.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/UnitTestCase.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/UnitTestCase.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/UnitTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,161 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit; + +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import junit.framework.AssertionFailedError; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + + +/** + * A basic JUnit {@link junit.framework.TestCase} subclass for + * adding some Hibernate specific behavior and functionality. + * + * @author Steve Ebersole + */ +public abstract class UnitTestCase extends junit.framework.TestCase { + + private static final Logger log = LoggerFactory.getLogger( UnitTestCase.class ); + + public UnitTestCase(String string) { + super( string ); + } + + /** + * runBare overridden in order to apply FailureExpected validations + * as well as start/complete logging + * + * @throws Throwable + */ + public void runBare() throws Throwable { + final boolean doValidate = getName().endsWith( "FailureExpected" ) && Boolean.getBoolean( "hibernate.test.validatefailureexpected" ); + try { + log.info( "Starting test [" + fullTestName() + "]" ); + super.runBare(); + if ( doValidate ) { + throw new FailureExpectedTestPassedException(); + } + } + catch ( FailureExpectedTestPassedException t ) { + throw t; + } + catch( Throwable t ) { + if ( doValidate ) { + skipExpectedFailure( t ); + } + else { + throw t; + } + } + finally { + log.info( "Completed test [" + fullTestName() + "]" ); + } + } + + private static class FailureExpectedTestPassedException extends Exception { + public FailureExpectedTestPassedException() { + super( "Test marked as FailureExpected, but did not fail!" ); + } + } + + protected void skipExpectedFailure(Throwable error) { + reportSkip( "ignoring *FailuredExpected methods", "Failed with: " + error.toString() ); + } + + // additional assertions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + public static void assertElementTypeAssignability(java.util.Collection collection, Class clazz) throws AssertionFailedError { + Iterator itr = collection.iterator(); + while ( itr.hasNext() ) { + assertClassAssignability( itr.next().getClass(), clazz ); + } + } + + public static void assertClassAssignability(Class source, Class target) throws AssertionFailedError { + if ( !target.isAssignableFrom( source ) ) { + throw new AssertionFailedError( + "Classes were not assignment-compatible : source<" + source.getName() + + "> target<" + target.getName() + ">" + ); + } + } + + + // test skipping ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + public String fullTestName() { + return this.getClass().getName() + "#" + this.getName(); + } + + protected void reportSkip(String reason, String testDescription) { + SkipLog.LOG.warn( "*** skipping [" + fullTestName() + "] - " + testDescription + " : " + reason, new Exception() ); + } + + // testsuite utitities --------------------------------------------------- + + /** + * Supports easy creation of TestSuites where a subclass' "FailureExpected" + * version of a base test is included in the suite, while the base test + * is excluded. E.g. test class FooTestCase includes method testBar(), while test + * class SubFooTestCase extends FooTestCase includes method testBarFailureExcluded(). + * Passing SubFooTestCase.class to this method will return a suite that + * does not include testBar(). + */ + public static TestSuite createFailureExpectedSuite(Class testClass) { + + TestSuite allTests = new TestSuite(testClass); + Set failureExpected = new HashSet(); + Enumeration tests = allTests.tests(); + while (tests.hasMoreElements()) { + Test t = (Test) tests.nextElement(); + if (t instanceof TestCase) { + String name = ((TestCase) t).getName(); + if (name.endsWith("FailureExpected")) + failureExpected.add(name); + } + } + + TestSuite result = new TestSuite(); + tests = allTests.tests(); + while (tests.hasMoreElements()) { + Test t = (Test) tests.nextElement(); + if (t instanceof TestCase) { + String name = ((TestCase) t).getName(); + if (!failureExpected.contains(name + "FailureExpected")) { + result.addTest(t); + } + } + } + + return result; + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/functional/DatabaseSpecificFunctionalTestCase.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/DatabaseSpecificFunctionalTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,50 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit.functional; + +import org.hibernate.testing.junit.SkipLog; + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public abstract class DatabaseSpecificFunctionalTestCase extends FunctionalTestCase { + public DatabaseSpecificFunctionalTestCase(String string) { + super( string ); + } + + protected void runTest() throws Throwable { + // Note: this protection comes into play when running + // tests individually. The suite as a whole is already + // "protected" by the fact that these tests are actually + // filtered out of the suite + if ( appliesTo( getDialect() ) ) { + super.runTest(); + } + else { + SkipLog.LOG.warn( "skipping database-specific test [" + fullTestName() + "] for dialect [" + getDialect().getClass().getName() + "]" ); + } + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/functional/ExecutionEnvironment.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,184 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit.functional; + +import java.util.Iterator; +import java.sql.Blob; +import java.sql.Clob; + +import org.hibernate.dialect.Dialect; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.Mappings; +import org.hibernate.SessionFactory; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.mapping.PersistentClass; +import org.hibernate.mapping.Property; +import org.hibernate.mapping.SimpleValue; +import org.hibernate.mapping.Collection; + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public class ExecutionEnvironment { + + public static final Dialect DIALECT = Dialect.getDialect(); + + private final ExecutionEnvironment.Settings settings; + + private Configuration configuration; + private SessionFactory sessionFactory; + private boolean allowRebuild; + + public ExecutionEnvironment(ExecutionEnvironment.Settings settings) { + this.settings = settings; + } + + public boolean isAllowRebuild() { + return allowRebuild; + } + + public void setAllowRebuild(boolean allowRebuild) { + this.allowRebuild = allowRebuild; + } + + public Dialect getDialect() { + return DIALECT; + } + + public Configuration getConfiguration() { + return configuration; + } + + public SessionFactory getSessionFactory() { + return sessionFactory; + } + + public void initialize() { + if ( sessionFactory != null ) { + throw new IllegalStateException( "attempt to initialize already initialized ExecutionEnvironment" ); + } + if ( ! settings.appliesTo( getDialect() ) ) { + return; + } + + Configuration configuration = new Configuration(); + configuration.setProperty( Environment.CACHE_PROVIDER, "org.hibernate.cache.HashtableCacheProvider" ); + + settings.configure( configuration ); + + applyMappings( configuration ); + applyCacheSettings( configuration ); + + + if ( settings.createSchema() ) { + configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); + } + + // make sure we use the same dialect... + configuration.setProperty( Environment.DIALECT, getDialect().getClass().getName() ); + + configuration.buildMappings(); + settings.afterConfigurationBuilt( configuration.createMappings(), getDialect() ); + + SessionFactory sessionFactory = configuration.buildSessionFactory(); + this.configuration = configuration; + this.sessionFactory = sessionFactory; + + settings.afterSessionFactoryBuilt( ( SessionFactoryImplementor ) sessionFactory ); + } + + private void applyMappings(Configuration configuration) { + String[] mappings = settings.getMappings(); + for ( int i = 0; i < mappings.length; i++ ) { + configuration.addResource( settings.getBaseForMappings() + mappings[i], ExecutionEnvironment.class.getClassLoader() ); + } + } + + private void applyCacheSettings(Configuration configuration) { + if ( settings.getCacheConcurrencyStrategy() != null ) { + Iterator iter = configuration.getClassMappings(); + while ( iter.hasNext() ) { + PersistentClass clazz = (PersistentClass) iter.next(); + Iterator props = clazz.getPropertyClosureIterator(); + boolean hasLob = false; + while ( props.hasNext() ) { + Property prop = (Property) props.next(); + if ( prop.getValue().isSimpleValue() ) { + String type = ( ( SimpleValue ) prop.getValue() ).getTypeName(); + if ( "blob".equals(type) || "clob".equals(type) ) { + hasLob = true; + } + if ( Blob.class.getName().equals(type) || Clob.class.getName().equals(type) ) { + hasLob = true; + } + } + } + if ( !hasLob && !clazz.isInherited() && settings.overrideCacheStrategy() ) { + configuration.setCacheConcurrencyStrategy( clazz.getEntityName(), settings.getCacheConcurrencyStrategy() ); + } + } + iter = configuration.getCollectionMappings(); + while ( iter.hasNext() ) { + Collection coll = (Collection) iter.next(); + configuration.setCollectionCacheConcurrencyStrategy( coll.getRole(), settings.getCacheConcurrencyStrategy() ); + } + } + } + + public void rebuild() { + if ( !allowRebuild ) { + return; + } + if ( sessionFactory != null ) { + sessionFactory.close(); + sessionFactory = null; + } + sessionFactory = configuration.buildSessionFactory(); + settings.afterSessionFactoryBuilt( ( SessionFactoryImplementor ) sessionFactory ); + } + + public void complete() { + if ( sessionFactory != null ) { + sessionFactory.close(); + sessionFactory = null; + } + configuration = null; + } + + public static interface Settings { + public String[] getMappings(); + public String getBaseForMappings(); + public boolean createSchema(); + public boolean recreateSchemaAfterFailure(); + public void configure(Configuration cfg); + public boolean overrideCacheStrategy(); + public String getCacheConcurrencyStrategy(); + public void afterSessionFactoryBuilt(SessionFactoryImplementor sfi); + public void afterConfigurationBuilt(Mappings mappings, Dialect dialect); + public boolean appliesTo(Dialect dialect); + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestCase.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,544 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit.functional; + +import java.util.List; +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; +import java.sql.Connection; + +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Mappings; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.DerbyDialect; +import org.hibernate.SessionFactory; +import org.hibernate.HibernateException; +import org.hibernate.Interceptor; +import org.hibernate.Session; +import org.hibernate.testing.junit.UnitTestCase; +import org.hibernate.engine.SessionFactoryImplementor; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Most of the Hibernate test suite in fact is a series of functional tests, not + * unit tests. Here is a base class for these functional tests. + * + * @author Steve Ebersole + */ +public abstract class FunctionalTestCase extends UnitTestCase implements ExecutionEnvironment.Settings { + + private static final Logger log = LoggerFactory.getLogger( FunctionalTestCase.class ); + + private ExecutionEnvironment environment; + private boolean isEnvironmentLocallyManaged; + + private org.hibernate.classic.Session session; + + public FunctionalTestCase(String string) { + super( string ); + } + + public ExecutionEnvironment getEnvironment() { + return environment; + } + + public void setEnvironment(ExecutionEnvironment environment) { + this.environment = environment; + } + + protected void prepareTest() throws Exception { + } + + protected void cleanupTest() throws Exception { + } + + // JUnit hooks ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + /** + * Override {@link junit.framework.TestCase#setUp()} to check if we need + * to build a locally managed execution environment. + * + * @throws Exception + */ + protected final void setUp() throws Exception { + if ( environment == null ) { + log.info( "Building locally managed execution env" ); + isEnvironmentLocallyManaged = true; + environment = new ExecutionEnvironment( this ); + environment.initialize(); + } + prepareTest(); + } + + /** + * Override {@link junit.framework.TestCase#tearDown()} to tear down + * the execution environment if it is locally managed. + * + * @throws Exception + */ + protected final void tearDown() throws Exception { + cleanupTest(); + if ( isEnvironmentLocallyManaged ) { + log.info( "Destroying locally managed execution env" ); + environment.complete(); + environment = null; + } + } + + /** + * runTest is overridden in order to apply session closure assertions. + * + * @throws Throwable + */ + protected void runTest() throws Throwable { + final boolean stats = sfi().getStatistics().isStatisticsEnabled(); + try { + if ( stats ) { + sfi().getStatistics().clear(); + } + + super.runTest(); + + if ( stats ) { + sfi().getStatistics().logSummary(); + } + + if ( session != null && session.isOpen() ) { + if ( session.isConnected() ) { + session.connection().rollback(); + } + session.close(); + session = null; + fail( "unclosed session" ); + } + else { + session = null; + } + assertAllDataRemoved(); + } + catch ( Throwable e ) { + log.trace( "test run resulted in error; attempting to cleanup", e ); + try { + if ( session != null && session.isOpen() ) { + if ( session.isConnected() ) { + session.connection().rollback(); + } + session.close(); + } + } + catch ( Exception ignore ) { + } + try { + if ( recreateSchemaAfterFailure() && environment != null ) { + environment.rebuild(); + } + } + catch ( Exception ignore ) { + } + throw e; + } + } + + protected void assertAllDataRemoved() { + if ( !createSchema() ) { + return; // no tables were created... + } + if ( !Boolean.getBoolean( "hibernate.test.validateDataCleanup" ) ) { + return; + } + + Session tmpSession = getSessions().openSession(); + try { + List list = tmpSession.createQuery( "select o from java.lang.Object o" ).list(); + + Map items = new HashMap(); + if ( !list.isEmpty() ) { + for ( Iterator iter = list.iterator(); iter.hasNext(); ) { + Object element = iter.next(); + Integer l = ( Integer ) items.get( tmpSession.getEntityName( element ) ); + if ( l == null ) { + l = new Integer( 0 ); + } + l = new Integer( l.intValue() + 1 ); + items.put( tmpSession.getEntityName( element ), l ); + System.out.println( "Data left: " + element ); + } + fail( "Data is left in the database: " + items.toString() ); + } + } + finally { + try { + tmpSession.close(); + } + catch( Throwable t ) { + // intentionally empty + } + } + } + + protected void skipExpectedFailure(Throwable error) { + super.skipExpectedFailure( error ); + try { + if ( recreateSchemaAfterFailure() && environment != null ) { + environment.rebuild(); + } + } + catch ( Exception ignore ) { + } + } + + // ExecutionEnvironment.Settings implementation ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + public String getBaseForMappings() { + return "org/hibernate/test/"; + } + + public boolean createSchema() { + return true; + } + + public boolean recreateSchemaAfterFailure() { + return true; + } + + public void configure(Configuration cfg) { + } + + public boolean overrideCacheStrategy() { + return true; + } + + public String getCacheConcurrencyStrategy() { + return "nonstrict-read-write"; + } + + public void afterSessionFactoryBuilt(SessionFactoryImplementor sfi) { + } + + public void afterConfigurationBuilt(Mappings mappings, Dialect dialect) { + } + + /** + * Intended to indicate that this test class as a whole is intended for + * a dialect or series of dialects. Skips here (appliesTo = false) therefore + * simply indicate that the given tests target a particular feature of the + * checked database and none of the tests on this class should be run for the + * checked dialect. + * + * @param dialect The dialect to be checked. + * @return False if the test class as a whole is specifically targetting + * a dialect (or series of dialects) other than the indicated dialect + * and the test should therefore be skipped in its entirety; + * true otherwise. + */ + public boolean appliesTo(Dialect dialect) { + return true; + } + + + // methods for subclasses to access environment ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + /** + * Get the factory for this test environment. + * + * @return The factory. + */ + protected SessionFactory getSessions() { + return environment.getSessionFactory(); + } + + /** + * Get the factory for this test environment, casted to {@link org.hibernate.engine.SessionFactoryImplementor}. + * <p/> + * Shorthand for ( {@link org.hibernate.engine.SessionFactoryImplementor} ) {@link #getSessions()}... + * + * @return The factory + */ + protected SessionFactoryImplementor sfi() { + return ( SessionFactoryImplementor ) getSessions(); + } + + protected Dialect getDialect() { + return ExecutionEnvironment.DIALECT; + } + + protected Configuration getCfg() { + return environment.getConfiguration(); + } + + public org.hibernate.classic.Session openSession() throws HibernateException { + session = getSessions().openSession(); + return session; + } + + public org.hibernate.classic.Session openSession(Interceptor interceptor) throws HibernateException { + session = getSessions().openSession(interceptor); + return session; + } + + + + /** + * Do connections enforce SERIALIZABLE isolation... + * + * @return + * @throws Exception + */ + protected boolean isSerializableIsolationEnforced() throws Exception { + Connection conn = null; + try { + conn = sfi().getConnectionProvider().getConnection(); + return conn.getTransactionIsolation() >= Connection.TRANSACTION_SERIALIZABLE; + } + finally { + if ( conn != null ) { + try { + sfi().getConnectionProvider().closeConnection( conn ); + } + catch ( Throwable ignore ) { + // ignore... + } + } + } + } + + /** + * Is connection at least read committed? + * <p/> + * Not, that this skip check relies on the JDBC driver reporting + * the true isolation level correctly. HSQLDB, for example, will + * report whatever you specify as the isolation + * (Connection.setTransationIsolation()), even though it only supports + * read-uncommitted. + * + * @param scenario text description of the scenario being tested. + * @return true if read-committed isolation is maintained. + */ + protected boolean readCommittedIsolationMaintained(String scenario) { + int isolation = java.sql.Connection.TRANSACTION_READ_UNCOMMITTED; + Session testSession = null; + try { + testSession = openSession(); + isolation = testSession.connection().getTransactionIsolation(); + } + catch( Throwable ignore ) { + } + finally { + if ( testSession != null ) { + try { + testSession.close(); + } + catch( Throwable ignore ) { + } + } + } + if ( isolation < java.sql.Connection.TRANSACTION_READ_COMMITTED ) { + reportSkip( "environment does not support at least read committed isolation", scenario ); + return false; + } + else { + return true; + } + } + + /** + * Does the db/dialect support using a column's physical name in the order-by clause + * even after it has been aliased in the select clause. This is not actually + * required by the SQL spec, although virtually ever DB in the world supports this + * (the most glaring omission here being IBM-variant DBs ala DB2 and Derby). + * + * @param testDescription description of the scenario being tested. + * @return true if is allowed + */ + protected boolean allowsPhysicalColumnNameInOrderby(String testDescription) { + if ( DB2Dialect.class.isInstance( getDialect() ) ) { + // https://issues.apache.org/jira/browse/DERBY-1624 + reportSkip( "Dialect does not support physical column name in order-by clause after it is aliased", testDescription ); + return false; + } + return true; + } + + /** + * Does the db/dialect support using a column's physical name in the having clause + * even after it has been aliased in the select/group-by clause. This is not actually + * required by the SQL spec, although virtually ever DB in the world supports this. + * + * @param testDescription description of the scenario being tested. + * @return true if is allowed + */ + protected boolean allowsPhysicalColumnNameInHaving(String testDescription) { + // I only *know* of this being a limitation on Derby, although I highly suspect + // it is a limitation on any IBM/DB2 variant + if ( DerbyDialect.class.isInstance( getDialect() ) ) { + // https://issues.apache.org/jira/browse/DERBY-1624 + reportSkip( "Dialect does not support physical column name in having clause after it is aliased", testDescription ); + return false; + } + return true; + } + + /** + * Does the db/dialect support empty lists in the IN operator? + * <p/> + * For example, is "... a.b IN () ..." supported? + * + * @param testDescription description of the scenario being tested. + * @return true if is allowed + */ + protected boolean dialectSupportsEmptyInList(String testDescription) { + if ( ! getDialect().supportsEmptyInList() ) { + reportSkip( "Dialect does not support SQL empty in list : x in ()", testDescription ); + return false; + } + return true; + } + + /** + * Is the db/dialect sensitive in terms of string comparisons? + * @param testDescription description of the scenario being tested. + * @return true if sensitive + */ + protected boolean dialectIsCaseSensitive(String testDescription) { + if ( ! getDialect().areStringComparisonsCaseInsensitive() ) { + reportSkip( "Dialect is case sensitive. ", testDescription ); + return true; + } + return false; + } + + protected boolean supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() { + if ( ! getDialect().supportsResultSetPositionQueryMethodsOnForwardOnlyCursor() ) { + reportSkip( "Driver does not support 'position query' methods on forward-only cursors", "query support" ); + return false; + } + return true; + } + + protected boolean supportsCircularCascadeDelete() { + if ( ! getDialect().supportsCircularCascadeDeleteConstraints() ) { + reportSkip( "db/dialect does not support 'circular' cascade delete constraints", "cascade delete constraint support" ); + return false; + } + return true; + } + + protected boolean supportsSubselectOnLeftSideIn() { + if ( ! getDialect().supportsSubselectAsInPredicateLHS() ) { + reportSkip( "Database does not support (<subselect>) in ( ... ) ", "query support" ); + return false; + } + return true; + } + + /** + * Expected LOB usage pattern is such that I can perform an insert + * via prepared statement with a parameter binding for a LOB value + * without crazy casting to JDBC driver implementation-specific classes... + * <p/> + * Part of the trickiness here is the fact that this is largely + * driver dependent. For Oracle, which is notoriously bad with + * LOB support in their drivers actually does a pretty good job with + * LOB support as of the 10.2.x versions of their drivers... + * + * @return True if expected usage pattern is support; false otherwise. + */ + protected boolean supportsExpectedLobUsagePattern() { + if ( ! getDialect().supportsExpectedLobUsagePattern() ) { + reportSkip( "database/driver does not support expected LOB usage pattern", "LOB support" ); + return false; + } + return true; + } + + /** + * Does the current dialect support propogating changes to LOB + * values back to the database? Talking about mutating the + * underlying value as opposed to supplying a new + * LOB instance... + * + * @return True if the changes are propogated back to the + * database; false otherwise. + */ + protected boolean supportsLobValueChangePropogation() { + if ( ! getDialect().supportsLobValueChangePropogation() ) { + reportSkip( "database/driver does not support propogating LOB value change back to database", "LOB support" ); + return false; + } + return true; + } + + /** + * Is it supported to materialize a LOB locator outside the transaction in + * which it was created? + * <p/> + * Again, part of the trickiness here is the fact that this is largely + * driver dependent. + * <p/> + * NOTE: all database I have tested which {@link #supportsExpectedLobUsagePattern()} + * also support the ability to materialize a LOB outside the owning transaction... + * + * @return True if unbounded materialization is supported; false otherwise. + */ + protected boolean supportsUnboundedLobLocatorMaterialization() { + if ( !getDialect().supportsUnboundedLobLocatorMaterialization() ) { + reportSkip( "database/driver does not support materializing a LOB locator outside the 'owning' transaction", "LOB support" ); + return false; + } + return true; + } + + protected boolean supportsSubqueryOnMutatingTable() { + if ( !getDialect().supportsSubqueryOnMutatingTable() ) { + reportSkip( "database/driver does not support referencing mutating table in subquery", "bulk DML support" ); + return false; + } + return true; + } + + protected boolean dialectIs(Class dialectClass) { + return dialectClass.isInstance( getDialect() ); + } + + protected boolean dialectIsOneOf(Class[] dialectClasses) { + for ( int i = 0; i < dialectClasses.length; i++ ) { + if ( dialectClasses[i].isInstance( getDialect() ) ) { + return true; + } + } + return false; + } + + protected boolean dialectIsNot(Class dialectClass) { + return ! dialectIs( dialectClass ); + } + + protected boolean dialectIsNot(Class[] dialectClasses) { + return ! dialectIsOneOf( dialectClasses ); + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/junit/functional/FunctionalTestClassTestSuite.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/FunctionalTestClassTestSuite.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,144 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit.functional; + +import junit.framework.TestSuite; +import junit.framework.Test; +import junit.framework.TestResult; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A specialized {@link junit.framework.TestSuite} implementation intended + * for use as an aggregate for a single test class specifically for the purpose + * of maintaing a single {@link org.hibernate.SessionFactory} for executings all + * tests defined as part of the given functional test class. + * + * @author Steve Ebersole + */ +public class FunctionalTestClassTestSuite extends TestSuite { + + private static final Logger log = LoggerFactory.getLogger( FunctionalTestClassTestSuite.class ); + + private ExecutionEnvironment.Settings settings; + private ExecutionEnvironment environment; + private Throwable environmentSetupError; + private int testCount; + private int testPosition; + + public FunctionalTestClassTestSuite(Class testClass, String name) { + super( testClass, name ); + } + + public FunctionalTestClassTestSuite(Class testClass) { + this( testClass, testClass.getName() ); + } + + + public void addTest(Test test) { + log.trace( "adding test [" + test + "]" ); + if ( settings == null ) { + if ( test instanceof ExecutionEnvironment.Settings ) { + settings = ( ExecutionEnvironment.Settings ) test; + // todo : we could also centralize the skipping of "database specific" tests here + // instead of duplicating this notion in AllTests and DatabaseSpecificFunctionalTestCase. + // as a test gets added, simply check to see if we should really add it via + // DatabaseSpecificFunctionalTestCase.appliesTo( ExecutionEnvironment.DIALECT )... + } + } + testCount++; + super.addTest( test ); + } + + public void run(TestResult testResult) { + if ( testCount == 0 ) { + // might be zero if database-specific... + return; + } + try { + log.info( "Starting test-suite [" + getName() + "]" ); + setUp(); + testPosition = 0; + super.run( testResult ); + } + finally { + try { + tearDown(); + } + catch( Throwable ignore ) { + } + log.info( "Completed test-suite [" + getName() + "]" ); + } + } + + public void runTest(Test test, TestResult testResult) { + testPosition++; + if ( environmentSetupError != null ) { + testResult.startTest( test ); + testResult.addError( test, environmentSetupError ); + testResult.endTest( test ); + return; + } + if ( ! ( test instanceof FunctionalTestCase ) ) { + super.runTest( test, testResult ); + } + else { + FunctionalTestCase functionalTest = ( ( FunctionalTestCase ) test ); + try { + // disallow rebuilding the schema because this is the last test + // in this suite, thus it is about to get dropped immediately + // afterwards anyway... + environment.setAllowRebuild( testPosition < testCount ); + functionalTest.setEnvironment( environment ); + super.runTest( functionalTest, testResult ); + } + finally { + functionalTest.setEnvironment( null ); + } + } + } + + protected void setUp() { + if ( settings == null ) { + return; + } + log.info( "Building aggregated execution environment" ); + try { + environment = new ExecutionEnvironment( settings ); + environment.initialize(); + } + catch( Throwable t ) { + environmentSetupError = t; + } + } + + protected void tearDown() { + if ( environment != null ) { + log.info( "Destroying aggregated execution environment" ); + environment.complete(); + this.environment = null; + } + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,332 @@ +// $Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.junit.functional.annotations; + +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.sql.Connection; +import java.sql.SQLException; + +import junit.framework.TestCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.hibernate.cfg.Configuration; +import org.hibernate.dialect.Dialect; +import org.hibernate.jdbc.Work; +import org.hibernate.testing.junit.DialectChecks; +import org.hibernate.testing.junit.FailureExpected; +import org.hibernate.testing.junit.RequiresDialect; +import org.hibernate.testing.junit.RequiresDialectFeature; +import org.hibernate.testing.junit.SkipForDialect; +import org.hibernate.testing.junit.SkipLog; +import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.hibernate.util.StringHelper; + +/** + * A base class for all tests. + * + * @author Emmnauel Bernand + * @author Hardy Ferentschik + */ +public abstract class HibernateTestCase extends TestCase { + + public static final Logger log = LoggerFactory.getLogger( HibernateTestCase.class ); + + protected static Configuration cfg; + private static Class<?> lastTestClass; + + public HibernateTestCase() { + super(); + } + + public HibernateTestCase(String x) { + super( x ); + } + + @Override + public void runBare() throws Throwable { + Method runMethod = findTestMethod(); + + final Skip skip = determineSkipByDialect( Dialect.getDialect(), runMethod ); + if ( skip != null ) { + reportSkip( skip ); + return; + } + + setUp(); + try { + runTest(); + } + finally { + tearDown(); + } + } + + @Override + protected void runTest() throws Throwable { + Method runMethod = findTestMethod(); + FailureExpected failureExpected = locateAnnotation( FailureExpected.class, runMethod ); + try { + super.runTest(); + if ( failureExpected != null ) { + throw new FailureExpectedTestPassedException(); + } + } + catch ( FailureExpectedTestPassedException t ) { + closeResources(); + throw t; + } + catch ( Throwable t ) { + if ( t instanceof InvocationTargetException ) { + t = ( ( InvocationTargetException ) t ).getTargetException(); + } + if ( t instanceof IllegalAccessException ) { + t.fillInStackTrace(); + } + closeResources(); + if ( failureExpected != null ) { + StringBuilder builder = new StringBuilder(); + if ( StringHelper.isNotEmpty( failureExpected.message() ) ) { + builder.append( failureExpected.message() ); + } + else { + builder.append( "ignoring @FailureExpected test" ); + } + builder.append( " (" ) + .append( failureExpected.jiraKey() ) + .append( ")" ); + SkipLog.LOG.warn( builder.toString(), t ); + } + else { + throw t; + } + } + } + + @Override + protected void setUp() throws Exception { + if ( cfg == null || lastTestClass != getClass() ) { + buildConfiguration(); + lastTestClass = getClass(); + } + else { + runSchemaGeneration(); + } + } + + @Override + protected void tearDown() throws Exception { + runSchemaDrop(); + handleUnclosedResources(); + } + + protected static class Skip { + private final String reason; + private final String testDescription; + + public Skip(String reason, String testDescription) { + this.reason = reason; + this.testDescription = testDescription; + } + } + + protected final Skip determineSkipByDialect(Dialect dialect, Method runMethod) throws Exception { + // skips have precedence, so check them first + SkipForDialect skipForDialectAnn = locateAnnotation( SkipForDialect.class, runMethod ); + if ( skipForDialectAnn != null ) { + for ( Class<? extends Dialect> dialectClass : skipForDialectAnn.value() ) { + if ( skipForDialectAnn.strictMatching() ) { + if ( dialectClass.equals( dialect.getClass() ) ) { + return buildSkip( dialect, skipForDialectAnn.comment(), skipForDialectAnn.jiraKey() ); + } + } + else { + if ( dialectClass.isInstance( dialect ) ) { + return buildSkip( dialect, skipForDialectAnn.comment(), skipForDialectAnn.jiraKey() ); + } + } + } + } + + // then check against the requires + RequiresDialect requiresDialectAnn = locateAnnotation( RequiresDialect.class, runMethod ); + if ( requiresDialectAnn != null ) { + for ( Class<? extends Dialect> dialectClass : requiresDialectAnn.value() ) { + if ( requiresDialectAnn.strictMatching() ) { + if ( !dialectClass.equals( dialect.getClass() ) ) { + return buildSkip( dialect, null, null ); + } + } + else { + if ( !dialectClass.isInstance( dialect ) ) { + return buildSkip( dialect, requiresDialectAnn.comment(), requiresDialectAnn.jiraKey() ); + } + } + } + } + + // then check against a dialect feature + RequiresDialectFeature requiresDialectFeatureAnn = locateAnnotation( RequiresDialectFeature.class, runMethod ); + if ( requiresDialectFeatureAnn != null ) { + Class<? extends DialectChecks> checkClass = requiresDialectFeatureAnn.value(); + DialectChecks check = checkClass.newInstance(); + boolean skip = !check.include( dialect ); + if ( skip ) { + return buildSkip( dialect, requiresDialectFeatureAnn.comment(), requiresDialectFeatureAnn.jiraKey() ); + } + } + return null; + } + + protected <T extends Annotation> T locateAnnotation(Class<T> annotationClass, Method runMethod) { + T annotation = runMethod.getAnnotation( annotationClass ); + if ( annotation == null ) { + annotation = getClass().getAnnotation( annotationClass ); + } + if ( annotation == null ) { + annotation = runMethod.getDeclaringClass().getAnnotation( annotationClass ); + } + return annotation; + } + + protected Skip buildSkip(Dialect dialect, String comment, String jiraKey) { + StringBuilder buffer = new StringBuilder(); + buffer.append( "skipping database-specific test [" ); + buffer.append( fullTestName() ); + buffer.append( "] for dialect [" ); + buffer.append( dialect.getClass().getName() ); + buffer.append( ']' ); + + if ( StringHelper.isNotEmpty( comment ) ) { + buffer.append( "; " ).append( comment ); + } + + if ( StringHelper.isNotEmpty( jiraKey ) ) { + buffer.append( " (" ).append( jiraKey ).append( ')' ); + } + + return new Skip( buffer.toString(), null ); + } + + public String fullTestName() { + return this.getClass().getName() + "#" + this.getName(); + } + + private Method findTestMethod() { + String fName = getName(); + assertNotNull( fName ); + Method runMethod = null; + try { + runMethod = getClass().getMethod( fName ); + } + catch ( NoSuchMethodException e ) { + fail( "Method \"" + fName + "\" not found" ); + } + if ( !Modifier.isPublic( runMethod.getModifiers() ) ) { + fail( "Method \"" + fName + "\" should be public" ); + } + return runMethod; + } + + protected abstract void buildConfiguration() throws Exception; + + protected abstract Class<?>[] getAnnotatedClasses(); + + protected String[] getMappings() { + return new String[] { }; + } + + protected abstract void handleUnclosedResources(); + + protected abstract void closeResources(); + + protected String[] getAnnotatedPackages() { + return new String[] { }; + } + + protected String[] getXmlFiles() { + return new String[] { }; + } + + protected Dialect getDialect() { + return Dialect.getDialect(); + } + + protected static void setCfg(Configuration cfg) { + HibernateTestCase.cfg = cfg; + } + + protected static Configuration getCfg() { + return cfg; + } + + protected void configure(Configuration cfg) { + } + + protected boolean recreateSchema() { + return true; + } + + protected void runSchemaGeneration() { + SchemaExport export = new SchemaExport( cfg ); + export.create( true, true ); + } + + protected void runSchemaDrop() { + SchemaExport export = new SchemaExport( cfg ); + export.drop( true, true ); + } + + private void reportSkip(Skip skip) { + reportSkip( skip.reason, skip.testDescription ); + } + + protected void reportSkip(String reason, String testDescription) { + StringBuilder builder = new StringBuilder(); + builder.append( "*** skipping test [" ); + builder.append( fullTestName() ); + builder.append( "] - " ); + builder.append( testDescription ); + builder.append( " : " ); + builder.append( reason ); + SkipLog.LOG.warn( builder.toString() ); + } + + public class RollbackWork implements Work { + + public void execute(Connection connection) throws SQLException { + connection.rollback(); + } + } + + private static class FailureExpectedTestPassedException extends Exception { + public FailureExpectedTestPassedException() { + super( "Test marked as @FailureExpected, but did not fail!" ); + } + } +} Property changes on: core/trunk/testing/src/main/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Copied: core/trunk/testing/src/main/java/org/hibernate/testing/tm/ConnectionProviderImpl.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/tm/ConnectionProviderImpl.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/tm/ConnectionProviderImpl.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/tm/ConnectionProviderImpl.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,83 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.tm; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; + +import org.hibernate.HibernateException; +import org.hibernate.connection.ConnectionProvider; +import org.hibernate.connection.ConnectionProviderFactory; + +/** + * A {@link ConnectionProvider} implementation adding JTA-style transactionality + * around the returned connections using the {@link SimpleJtaTransactionManagerImpl}. + * + * @author Gavin King + * @author Steve Ebersole + */ +public class ConnectionProviderImpl implements ConnectionProvider { + private static ConnectionProvider actualConnectionProvider = ConnectionProviderFactory.newConnectionProvider(); + + private boolean isTransactional; + + public static ConnectionProvider getActualConnectionProvider() { + return actualConnectionProvider; + } + + public void configure(Properties props) throws HibernateException { + } + + public Connection getConnection() throws SQLException { + SimpleJtaTransactionImpl currentTransaction = SimpleJtaTransactionManagerImpl.getInstance().getCurrentTransaction(); + if ( currentTransaction == null ) { + isTransactional = false; + return actualConnectionProvider.getConnection(); + } + else { + isTransactional = true; + Connection connection = currentTransaction.getEnlistedConnection(); + if ( connection == null ) { + connection = actualConnectionProvider.getConnection(); + currentTransaction.enlistConnection( connection ); + } + return connection; + } + } + + public void closeConnection(Connection conn) throws SQLException { + if ( !isTransactional ) { + conn.close(); + } + } + + public void close() throws HibernateException { + actualConnectionProvider.close(); + } + + public boolean supportsAggressiveRelease() { + return true; + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/tm/SimpleJtaTransactionImpl.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,159 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.tm; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.LinkedList; +import javax.transaction.HeuristicMixedException; +import javax.transaction.HeuristicRollbackException; +import javax.transaction.RollbackException; +import javax.transaction.Status; +import javax.transaction.Synchronization; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.xa.XAResource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * SimpleJtaTransactionImpl implementation + * + * @author Steve Ebersole + */ +public class SimpleJtaTransactionImpl implements Transaction { + private static final Logger log = LoggerFactory.getLogger( SimpleJtaTransactionImpl.class ); + + private int status; + private LinkedList synchronizations; + private Connection connection; // the only resource we care about is jdbc connection + private final SimpleJtaTransactionManagerImpl jtaTransactionManager; + + public SimpleJtaTransactionImpl(SimpleJtaTransactionManagerImpl jtaTransactionManager) { + this.jtaTransactionManager = jtaTransactionManager; + this.status = Status.STATUS_ACTIVE; + } + + public int getStatus() { + return status; + } + + public void commit() + throws RollbackException, HeuristicMixedException, HeuristicRollbackException, IllegalStateException, SystemException { + + if ( status == Status.STATUS_MARKED_ROLLBACK ) { + log.trace( "on commit, status was marked for rollback-only" ); + rollback(); + } + else { + status = Status.STATUS_PREPARING; + + for ( int i = 0; i < synchronizations.size(); i++ ) { + Synchronization s = ( Synchronization ) synchronizations.get( i ); + s.beforeCompletion(); + } + + status = Status.STATUS_COMMITTING; + + if ( connection != null ) { + try { + connection.commit(); + connection.close(); + } + catch ( SQLException sqle ) { + status = Status.STATUS_UNKNOWN; + throw new SystemException(); + } + } + + status = Status.STATUS_COMMITTED; + + for ( int i = 0; i < synchronizations.size(); i++ ) { + Synchronization s = ( Synchronization ) synchronizations.get( i ); + s.afterCompletion( status ); + } + + //status = Status.STATUS_NO_TRANSACTION; + jtaTransactionManager.endCurrent( this ); + } + } + + public void rollback() throws IllegalStateException, SystemException { + status = Status.STATUS_ROLLEDBACK; + + if ( connection != null ) { + try { + connection.rollback(); + connection.close(); + } + catch ( SQLException sqle ) { + status = Status.STATUS_UNKNOWN; + throw new SystemException(); + } + } + + for ( int i = 0; i < synchronizations.size(); i++ ) { + Synchronization s = ( Synchronization ) synchronizations.get( i ); + s.afterCompletion( status ); + } + + //status = Status.STATUS_NO_TRANSACTION; + jtaTransactionManager.endCurrent( this ); + } + + public void setRollbackOnly() throws IllegalStateException, SystemException { + status = Status.STATUS_MARKED_ROLLBACK; + } + + public void registerSynchronization(Synchronization synchronization) + throws RollbackException, IllegalStateException, SystemException { + // todo : find the spec-allowable statuses during which synch can be registered... + if ( synchronizations == null ) { + synchronizations = new LinkedList(); + } + synchronizations.add( synchronization ); + } + + public void enlistConnection(Connection connection) { + if ( this.connection != null ) { + throw new IllegalStateException( "Connection already registered" ); + } + this.connection = connection; + } + + public Connection getEnlistedConnection() { + return connection; + } + + + public boolean enlistResource(XAResource xaResource) + throws RollbackException, IllegalStateException, SystemException { + return false; + } + + public boolean delistResource(XAResource xaResource, int i) throws IllegalStateException, SystemException { + return false; + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/tm/SimpleJtaTransactionManagerImpl.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/tm/SimpleJtaTransactionManagerImpl.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,110 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.tm; + +import javax.transaction.HeuristicMixedException; +import javax.transaction.HeuristicRollbackException; +import javax.transaction.InvalidTransactionException; +import javax.transaction.NotSupportedException; +import javax.transaction.RollbackException; +import javax.transaction.Status; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; + +/** + * TransactionManager implementation specifically designed for use in test suite and simple usage + * scenarios. For example, it assumes that there is only ever a single transaction active at a + * given time. + * + * @author Gavin King + * @author Steve Ebersole + */ +public class SimpleJtaTransactionManagerImpl implements TransactionManager { + private static final SimpleJtaTransactionManagerImpl INSTANCE = new SimpleJtaTransactionManagerImpl(); + + private SimpleJtaTransactionImpl currentTransaction; + + public static SimpleJtaTransactionManagerImpl getInstance() { + return INSTANCE; + } + + public int getStatus() throws SystemException { + return currentTransaction == null ? Status.STATUS_NO_TRANSACTION : currentTransaction.getStatus(); + } + + public Transaction getTransaction() throws SystemException { + return currentTransaction; + } + + public SimpleJtaTransactionImpl getCurrentTransaction() { + return currentTransaction; + } + + public void begin() throws NotSupportedException, SystemException { + currentTransaction = new SimpleJtaTransactionImpl( this ); + } + + public Transaction suspend() throws SystemException { + SimpleJtaTransactionImpl suspended = currentTransaction; + currentTransaction = null; + return suspended; + } + + public void resume(Transaction transaction) + throws InvalidTransactionException, IllegalStateException, SystemException { + currentTransaction = ( SimpleJtaTransactionImpl ) transaction; + } + + public void commit() + throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException { + if ( currentTransaction == null ) { + throw new IllegalStateException( "no current transaction to commit" ); + } + currentTransaction.commit(); + } + + public void rollback() throws IllegalStateException, SecurityException, SystemException { + if ( currentTransaction == null ) { + throw new IllegalStateException( "no current transaction" ); + } + currentTransaction.rollback(); + } + + public void setRollbackOnly() throws IllegalStateException, SystemException { + if ( currentTransaction == null ) { + throw new IllegalStateException( "no current transaction" ); + } + currentTransaction.setRollbackOnly(); + } + + public void setTransactionTimeout(int i) throws SystemException { + } + + void endCurrent(SimpleJtaTransactionImpl transaction) { + if ( transaction == currentTransaction ) { + currentTransaction = null; + } + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/tm/TransactionManagerLookupImpl.java) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/tm/TransactionManagerLookupImpl.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,50 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors.  All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.testing.tm; + +import java.util.Properties; +import javax.transaction.TransactionManager; +import javax.transaction.Transaction; + +import org.hibernate.transaction.TransactionManagerLookup; +import org.hibernate.HibernateException; + +/** + * TransactionManagerLookupImpl implementation + * + * @author Steve Ebersole + */ +public class TransactionManagerLookupImpl implements TransactionManagerLookup { + public TransactionManager getTransactionManager(Properties props) throws HibernateException { + return SimpleJtaTransactionManagerImpl.getInstance(); + } + + public String getUserTransactionName() { + throw new UnsupportedOperationException( "jndi currently not implemented for these tests" ); + } + + public Object getTransactionIdentifier(Transaction transaction) { + return transaction; + } +} Copied: core/trunk/testing/src/main/java/org/hibernate/testing/tm/package.html (from rev 19909, core/trunk/testing/src/main/java/org/hibernate/test/tm/package.html) =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/testing/tm/package.html (rev 0) +++ core/trunk/testing/src/main/java/org/hibernate/testing/tm/package.html 2010-07-07 19:39:23 UTC (rev 19910) @@ -0,0 +1,38 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> + +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors.  All third-party contributions are + ~ distributed under license by Red Hat Middleware LLC. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + --> +<HTML> +<HEAD> + <TITLE>Package Information - org.hibernate.test.tm</TITLE> +</HEAD> +<BODY> +<p> + Defines a simplified JTA TransactionManager and transactional connection pool + designed for use in test suite and simple usage scenarios. For example, it + is assumed that there is only ever a single transaction active at a given time. + Also, the only 'resource' that the transaction tracks is a single JDBC connection. +</p> +</BODY> +</HTML> \ No newline at end of file Modified: core/trunk/testsuite/src/test/java/org/hibernate/jdbc/GeneralWorkTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/jdbc/GeneralWorkTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/jdbc/GeneralWorkTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,8 +24,8 @@ import org.hibernate.JDBCException; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * GeneralWorkTest implementation Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/FailureExpectedCollector.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/FailureExpectedCollector.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/FailureExpectedCollector.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,7 +8,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.hibernate.junit.TestSuiteVisitor; +import org.hibernate.testing.junit.TestSuiteVisitor; /** * A simple class to collect the names of "failure expected" tests... Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import junit.framework.Test; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import junit.framework.Test; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/any/AnyTypeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,8 +1,8 @@ package org.hibernate.test.any; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import junit.framework.Test; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/array/ArrayTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/array/ArrayTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/array/ArrayTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Emmanuel Bernard Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.hql.ast.util.ASTParentsFirstIterator; import org.hibernate.hql.ast.util.ASTPrinter; import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * Test ASTIterator. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ast/ASTUtilTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,7 +7,7 @@ import junit.framework.TestSuite; import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * Unit test for ASTUtil. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/batch/BatchTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.dialect.PostgreSQLDialect; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bidi/AuctionTest2.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import junit.framework.Test; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/CGLIBThreadLocalTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,10 +1,12 @@ package org.hibernate.test.bytecode.cglib; -import org.hibernate.junit.functional.*; import org.hibernate.cfg.*; import org.hibernate.*; import org.hibernate.proxy.*; import org.hibernate.test.bytecode.*; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; + import junit.framework.*; import java.lang.reflect.*; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/InvocationTargetExceptionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,9 +3,10 @@ import org.hibernate.test.bytecode.Bean; import org.hibernate.Session; import org.hibernate.Hibernate; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Environment; + import junit.framework.TestSuite; import java.text.ParseException; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/ReflectionOptimizerTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/ReflectionOptimizerTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/cglib/ReflectionOptimizerTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import org.hibernate.bytecode.ReflectionOptimizer; import org.hibernate.bytecode.cglib.BytecodeProviderImpl; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.bytecode.Bean; import org.hibernate.test.bytecode.BeanReflectionHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.bytecode.Bean; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import org.hibernate.bytecode.ReflectionOptimizer; import org.hibernate.bytecode.javassist.BytecodeProviderImpl; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.bytecode.Bean; import org.hibernate.test.bytecode.BeanReflectionHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/BidirectionalOneToManyCascadeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gail Badner (based on annotations test case submitted by Edward Costello) Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/MultiPathCascadeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -30,8 +30,8 @@ import org.hibernate.Session; import org.hibernate.TransientObjectException; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/RefreshTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/RefreshTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/RefreshTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of RefreshTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,8 +29,8 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * The test case uses the following model: Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,8 +33,8 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * The test case uses the following model: Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.io.File; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.util.SerializationHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,7 +24,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.cfg.Configuration; import org.hibernate.util.SerializationHelper; import org.hibernate.SessionFactory; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ListenerTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ListenerTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cfg/ListenerTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -31,7 +31,7 @@ import org.hibernate.event.DeleteEvent; import org.hibernate.event.DeleteEventListener; import org.hibernate.event.def.DefaultDeleteEventListener; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cid/CompositeIdWithGeneratorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -32,8 +32,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests the use of composite-id with a generator. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -17,8 +17,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.LockMode; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/bag/PersistentBagTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Session; import org.hibernate.collection.PersistentBag; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests related to operations on a PersistentBag. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/idbag/PersistentIdBagTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Session; import org.hibernate.collection.PersistentIdentifierBag; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests related to operations on a PersistentIdentifierBag Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/list/PersistentListTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Session; import org.hibernate.collection.PersistentList; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests related to operations on a PersistentList Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/map/PersistentMapTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Session; import org.hibernate.collection.PersistentMap; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Test various situations using a {@link PersistentMap}. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/original/CollectionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/original/CollectionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/original/CollectionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetNonLazyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,17 +24,9 @@ */ package org.hibernate.test.collection.set; -import java.util.HashSet; - import junit.framework.Test; -import org.hibernate.Session; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.collection.PersistentSet; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.stat.CollectionStatistics; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/collection/set/PersistentSetTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.collection.PersistentSet; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.CollectionStatistics; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/component/basic/ComponentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -18,8 +18,8 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.mapping.Component; import org.hibernate.mapping.Formula; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/collection/CascadeToComponentCollectionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/component/cascading/toone/CascadeToComponentAssociationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/compositeelement/CompositeElementTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Component; import org.hibernate.mapping.Formula; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/AggressiveReleaseTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -15,10 +15,10 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.impl.SessionImpl; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.test.tm.ConnectionProviderImpl; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; -import org.hibernate.test.tm.TransactionManagerLookupImpl; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.tm.ConnectionProviderImpl; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.tm.TransactionManagerLookupImpl; import org.hibernate.transaction.CMTTransactionFactory; import org.hibernate.util.SerializationHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/BasicConnectionProviderTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of BasicConnectionProviderTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ConnectionManagementTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.util.SerializationHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/CurrentSessionConnectionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of CurrentSessionConnectionTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/SuppliedConnectionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,7 +13,7 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.connection.ConnectionProviderFactory; import org.hibernate.connection.UserSuppliedConnectionProvider; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.tool.hbm2ddl.SchemaExport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,7 +8,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.context.ThreadLocalSessionContext; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/CriteriaQueryTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -22,15 +22,13 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Projection; -import org.hibernate.criterion.ProjectionList; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Subqueries; -import org.hibernate.dialect.HSQLDialect; import org.hibernate.exception.SQLGrammarException; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.hql.Animal; import org.hibernate.test.hql.Reptile; import org.hibernate.transform.Transformers; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LikeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -30,7 +30,7 @@ import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; public class LikeTest extends FunctionalTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/criteria/LongInElementsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -35,7 +35,7 @@ import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.TeradataDialect; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.test.hql.StateProvince; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/cut/CompositeUserTypeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/deletetransient/DeleteTransientEntityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,8 +4,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * todo: describe DeleteTransientEntityTest Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/function/MySQLRoundFunctionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -28,9 +28,8 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.dialect.Dialect; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -37,7 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.hibernate.Hibernate; import org.hibernate.LockMode; import org.hibernate.Query; import org.hibernate.ScrollableResults; @@ -52,8 +51,8 @@ import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.TimesTenDialect; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.legacy.Blobber; import org.hibernate.test.legacy.Broken; import org.hibernate.test.legacy.Fixed; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,7 +2,7 @@ import java.util.Collections; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.dialect.Dialect; import org.hibernate.util.StringHelper; import org.hibernate.LockMode; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/discriminator/DiscriminatorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/interceptor/InterceptorDynamicEntityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.dynamicentity.Company; import org.hibernate.test.dynamicentity.Customer; import org.hibernate.test.dynamicentity.ProxyHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer/TuplizerDynamicEntityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Hibernate; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import junit.framework.TestSuite; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/dynamicentity/tuplizer2/ImprovedTuplizerDynamicEntityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,8 +33,8 @@ import org.hibernate.Hibernate; import org.hibernate.EntityMode; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import junit.framework.TestSuite; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ecid/EmbeddedCompositeIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/basic/Dom4jTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Example; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.transform.Transformers; import org.hibernate.util.XMLHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/component/Dom4jComponentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/component/Dom4jComponentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/component/Dom4jComponentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,8 +26,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; import org.hibernate.EntityMode; import org.hibernate.cfg.Configuration; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/dom4j/many2one/Dom4jManyToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,11 +10,11 @@ import org.hibernate.EntityMode; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** - * @author Paco Hern�ndez + * @author Paco Hern�ndez */ public class Dom4jManyToOneTest extends FunctionalTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/basic/DynamicClassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -15,8 +15,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/map/subclass/SubclassDynamicMapTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -25,7 +25,7 @@ import java.util.HashMap; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entitymode/multi/MultiRepresentationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,7 +6,6 @@ import java.util.List; import junit.framework.Test; -import junit.framework.TestSuite; import org.dom4j.DocumentFactory; import org.dom4j.Element; import org.dom4j.io.OutputFormat; @@ -15,8 +14,8 @@ import org.hibernate.EntityMode; import org.hibernate.Transaction; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of MultiRepresentationTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/entityname/EntityNameFromSubClassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,7 +1,8 @@ package org.hibernate.test.entityname; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; + /** * * @author stliu Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/AbstractCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -30,7 +30,7 @@ import org.hibernate.collection.PersistentCollection; import org.hibernate.collection.PersistentSet; import org.hibernate.event.AbstractCollectionEvent; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.test.event.collection.association.bidirectional.manytomany.ChildWithBidirectionalManyToMany; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/BrokenCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -32,8 +32,8 @@ import org.hibernate.Transaction; import org.hibernate.collection.PersistentCollection; import org.hibernate.event.AbstractCollectionEvent; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.association.bidirectional.manytomany.ChildWithBidirectionalManyToMany; import org.hibernate.test.event.collection.association.unidirectional.ParentWithCollectionOfEntities; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManyBagToSetCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,10 +26,9 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.ParentWithCollection; import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest; -import org.hibernate.test.event.collection.association.bidirectional.manytomany.ParentWithBidirectionalManyToMany; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/manytomany/BidirectionalManyToManySetToSetCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,10 +26,9 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.ParentWithCollection; import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest; -import org.hibernate.test.event.collection.association.bidirectional.manytomany.ParentWithBidirectionalManyToMany; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,12 +26,10 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.Child; import org.hibernate.test.event.collection.ParentWithCollection; import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest; -import org.hibernate.test.event.collection.association.bidirectional.onetomany.ChildWithManyToOne; -import org.hibernate.test.event.collection.association.bidirectional.onetomany.ParentWithBidirectionalOneToMany; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManyBagSubclassCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -21,17 +21,10 @@ */ package org.hibernate.test.event.collection.association.bidirectional.onetomany; -import java.util.ArrayList; -import java.util.Collection; - import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.test.event.collection.Child; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.ParentWithCollection; -import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest; -import org.hibernate.test.event.collection.association.bidirectional.onetomany.ChildWithManyToOne; -import org.hibernate.test.event.collection.association.bidirectional.onetomany.ParentWithBidirectionalOneToMany; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/bidirectional/onetomany/BidirectionalOneToManySetCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,12 +26,10 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.Child; import org.hibernate.test.event.collection.ParentWithCollection; import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest; -import org.hibernate.test.event.collection.association.bidirectional.onetomany.ChildWithManyToOne; -import org.hibernate.test.event.collection.association.bidirectional.onetomany.ParentWithBidirectionalOneToMany; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/manytomany/UnidirectionalManyToManyBagCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.Child; import org.hibernate.test.event.collection.ChildEntity; import org.hibernate.test.event.collection.ParentWithCollection; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManyBagCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.Child; import org.hibernate.test.event.collection.ChildEntity; import org.hibernate.test.event.collection.ParentWithCollection; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/association/unidirectional/onetomany/UnidirectionalOneToManySetCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.ParentWithCollection; import org.hibernate.test.event.collection.association.AbstractAssociationCollectionEventTest; import org.hibernate.test.event.collection.association.unidirectional.ParentWithCollectionOfEntities; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/event/collection/values/ValuesBagCollectionEventTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,10 +26,9 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.event.collection.AbstractCollectionEventTest; import org.hibernate.test.event.collection.ParentWithCollection; -import org.hibernate.test.event.collection.values.ParentWithCollectionOfValues; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/events/CallbackTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,7 +33,7 @@ import org.hibernate.event.Destructible; import org.hibernate.event.Initializable; import org.hibernate.event.DeleteEvent; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * CallbackTest implementation Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/exception/SQLExceptionConversionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.exception.SQLGrammarException; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.util.JDBCExceptionReporter; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,7 +6,7 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/extralazy/ExtraLazyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/extralazy/ExtraLazyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/extralazy/ExtraLazyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/fetchprofiles/join/JoinFetchProfileTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; import org.hibernate.Hibernate; import org.hibernate.UnknownProfileException; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,8 +27,8 @@ import org.hibernate.criterion.Subqueries; import org.hibernate.engine.SessionImplementor; import org.hibernate.impl.SessionFactoryImpl; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.transform.DistinctRootEntityResultTransformer; import org.slf4j.Logger; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/BasicFilteredBulkManipulationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,7 +24,7 @@ */ package org.hibernate.test.filter.hql; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/filter/hql/JoinedFilteredBulkManipulationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.Date; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.PostgreSQLDialect; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generated/AbstractGeneratedPropertyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.Hibernate; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; /** * Implementation of AbstractGeneratedPropertyTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generated/PartiallyGeneratedComponentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.Session; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TimestampGeneratedValuesWithCachingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,7 +9,7 @@ import org.hibernate.dialect.SybaseAnywhereDialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of TimestampGeneratedValuesWithCachingTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithCachingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import junit.framework.Test; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generated/TriggerGeneratedValuesWithoutCachingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of TriggerGeneratedValuesWithoutCachingTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/identity/IdentityGeneratedKeysTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/select/SelectGeneratorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/generatedkeys/seqidentity/SequenceIdentityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.MySQLDialect; @@ -38,8 +37,8 @@ import org.hibernate.dialect.SybaseAnywhereDialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.hql.ast.ASTQueryTranslatorFactory; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.DiscriminatorType; import org.hibernate.stat.QueryStatistics; import org.hibernate.test.any.IntegerPropertyValue; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/BulkManipulationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.hql.ast.HqlSqlWalker; import org.hibernate.id.IdentifierGenerator; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import org.slf4j.Logger; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ClassicTranslatorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,7 +6,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Some simple test queries using the classic translator explicitly Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaClassicAggregationReturnTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,7 +13,7 @@ import org.hibernate.hql.QueryTranslatorFactory; import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; import org.hibernate.Hibernate; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/CriteriaHQLAlignmentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,16 +4,13 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collections; -import java.util.List; import junit.framework.Test; import org.hibernate.Hibernate; -import org.hibernate.QueryException; import org.hibernate.Transaction; -import org.hibernate.dialect.HSQLDialect; import org.hibernate.exception.SQLGrammarException; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.classic.Session; import org.hibernate.criterion.Projections; import org.hibernate.hql.QueryTranslator; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/EJBQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/EJBQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/EJBQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -15,8 +15,8 @@ import org.hibernate.hql.ast.HqlParser; import org.hibernate.hql.ast.QueryTranslatorImpl; import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import antlr.RecognitionException; import antlr.TokenStreamException; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -37,8 +37,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests HQL and Criteria queries using DB columns having the same name as registerd functions. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/HQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -44,7 +44,7 @@ import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.SelectClause; import org.hibernate.hql.ast.util.ASTUtil; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import antlr.RecognitionException; import antlr.collections.AST; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/QueryTranslatorTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -20,7 +20,7 @@ import org.hibernate.EntityMode; import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.query.HQLQueryPlan; @@ -32,7 +32,6 @@ import org.hibernate.hql.ast.util.ASTPrinter; import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; import org.hibernate.util.StringHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/ScrollableCollectionFetchingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,8 +1,6 @@ // $Id: ScrollableCollectionFetchingTest.java 10977 2006-12-12 23:28:04Z steve.ebersole(a)jboss.com $ package org.hibernate.test.hql; -import java.util.List; - import junit.framework.Test; import org.hibernate.HibernateException; @@ -10,8 +8,8 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests the new functionality of allowing scrolling of results which Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/hql/WithClauseTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,7 +2,6 @@ package org.hibernate.test.hql; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import junit.framework.Test; @@ -12,8 +11,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.hql.ast.InvalidWithClauseException; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of WithClauseTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Emmanuel Bernard Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/id/UseIdentifierRollbackTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/id/UseIdentifierRollbackTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/id/UseIdentifierRollbackTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Emmanuel Bernard Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,7 +24,7 @@ package org.hibernate.test.id.uuid.sqlrep.sqlbinary; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.test.id.uuid.sqlrep.Node; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/id/uuid/strategy/CustomStrategyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,7 +24,7 @@ package org.hibernate.test.id.uuid.strategy; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idbag/IdBagTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idbag/IdBagTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idbag/IdBagTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idclass/IdClassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idclass/IdClassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idclass/IdClassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -28,8 +28,8 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,8 +27,8 @@ import org.hibernate.Session; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.TableStructure; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import static org.hibernate.id.IdentifierGeneratorHelper.BasicHolder; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.TableStructure; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import static org.hibernate.id.IdentifierGeneratorHelper.BasicHolder; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.id.enhanced.TableStructure; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import static org.hibernate.id.IdentifierGeneratorHelper.BasicHolder; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/BasicSequenceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; import org.hibernate.id.enhanced.SequenceStyleGenerator; import org.hibernate.persister.entity.EntityPersister; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/HiLoSequenceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.SequenceStyleGenerator; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/sequence/PooledSequenceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.SequenceStyleGenerator; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/BasicTableTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.id.enhanced.TableGenerator; import org.hibernate.Session; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/HiLoTableTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.TableGenerator; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/table/PooledTableTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.id.enhanced.OptimizerFactory; import org.hibernate.id.enhanced.TableGenerator; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/idprops/IdentifierPropertyReferencesTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ImmutableTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ImmutableTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/ImmutableTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -36,8 +36,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Projections; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -35,7 +35,7 @@ import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.hibernate.impl.SessionFactoryImpl; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * @author Gail Badner Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -35,7 +35,7 @@ import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.hibernate.impl.SessionFactoryImpl; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * @author Gail Badner Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithManyToManyTest; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyJoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/EntityWithInverseOneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithManyToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyFailureExpectedTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinFailureExpectedTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyJoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/inverse/VersionedEntityWithInverseOneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithManyToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseManyToManyUnidirTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithManyToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyJoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/EntityWithNonInverseOneToManyUnidirTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithManyToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyJoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/immutable/entitywithmutablecollection/noninverse/VersionedEntityWithNonInverseOneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.immutable.entitywithmutablecollection.AbstractEntityWithOneToManyTest; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/importfile/ImportFileTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/importfile/ImportFileTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/importfile/ImportFileTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,7 +6,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * @author Emmanuel Bernard Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/insertordering/InsertOrderingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.Session; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/buildtime/InstrumentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import junit.framework.TestSuite; import org.hibernate.intercept.FieldInterceptionHelper; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.test.instrument.cases.Executable; import org.hibernate.test.instrument.cases.TestCustomColumnReadAndWrite; import org.hibernate.test.instrument.cases.TestDirtyCheckExecutable; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/instrument/runtime/AbstractTransformingClassLoaderInstrumentTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,7 +7,7 @@ import org.hibernate.bytecode.InstrumentedClassLoader; import org.hibernate.bytecode.util.BasicClassFilter; import org.hibernate.bytecode.util.FieldFilter; -import org.hibernate.junit.AbstractClassLoaderIsolatedTestCase; +import org.hibernate.testing.junit.AbstractClassLoaderIsolatedTestCase; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.EmptyInterceptor; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.type.Type; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/iterate/IterateTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/iterate/IterateTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/iterate/IterateTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/join/JoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/join/JoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/join/JoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/join/OptionalJoinTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,13 +4,13 @@ /** * @author Chris Jones and Gail Badner */ -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; import org.hibernate.Transaction; + import junit.framework.Test; -import java.sql.ResultSet; import java.util.List; public class OptionalJoinTest extends FunctionalTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.Transaction; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/AbstractJPATest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,7 +13,7 @@ import org.hibernate.event.FlushEntityEventListener; import org.hibernate.engine.CascadingAction; import org.hibernate.util.IdentityMap; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import java.io.Serializable; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,14 +3,8 @@ import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.Session; import org.hibernate.TransientObjectException; -import org.hibernate.EntityMode; -import org.hibernate.HibernateException; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.engine.Status; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.event.FlushEntityEventListener; -import org.hibernate.event.FlushEntityEvent; -import org.hibernate.cfg.Configuration; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import junit.framework.Test; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/fetch/FetchingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/fetch/FetchingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/fetch/FetchingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,7 +7,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/JPALockTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.test.jpa.Item; import org.hibernate.test.jpa.MyEntity; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/lock/RepeatableReadTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,7 +10,7 @@ import org.hibernate.Transaction; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.exception.SQLGrammarException; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.test.jpa.Item; import org.hibernate.test.jpa.Part; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/proxy/JPAProxyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,7 +6,7 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.test.jpa.Item; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/JPAQLComplianceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/ql/NativeQueryTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/jpa/removed/RemovedEntityTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.jpa.AbstractJPATest; import org.hibernate.test.jpa.Item; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,7 +1,5 @@ package org.hibernate.test.keymanytoone.bidir.component; -import java.util.List; - import junit.framework.Test; import org.hibernate.HibernateException; @@ -11,8 +9,8 @@ import org.hibernate.event.LoadEvent; import org.hibernate.event.LoadEventListener; import org.hibernate.event.def.DefaultLoadEventListener; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Steve Ebersole Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lazycache/InstrumentCacheTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lazycache/InstrumentCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lazycache/InstrumentCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.intercept.FieldInterceptionHelper; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.intercept.FieldInterceptionHelper; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCProxyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCProxyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCProxyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.Transaction; import org.hibernate.classic.Session; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; public class ABCProxyTest extends LegacyTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ABCTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,11 +4,10 @@ import java.util.List; import junit.framework.Test; -import junit.framework.TestSuite; import junit.textui.TestRunner; import org.hibernate.classic.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; public class ABCTest extends LegacyTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,7 +10,7 @@ import org.hibernate.cache.ReadWriteCache; import org.hibernate.cache.HashtableCacheProvider; import org.hibernate.cache.access.SoftLock; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; public class CacheTest extends UnitTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ComponentNotNullTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,7 +9,7 @@ import org.hibernate.PropertyValueException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Test some cases of not-null properties inside components. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,10 +9,8 @@ import org.hibernate.HibernateException; import org.hibernate.id.PostInsertIdentifierGenerator; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.classic.Session; -import org.hibernate.dialect.HSQLDialect; -import org.hibernate.dialect.MySQLDialect; /** * @author MAX Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -34,7 +34,6 @@ import org.hibernate.QueryException; import org.hibernate.ScrollableResults; import org.hibernate.Transaction; -import org.hibernate.LockOptions; import org.hibernate.cfg.Environment; import org.hibernate.classic.Session; import org.hibernate.connection.ConnectionProvider; @@ -58,9 +57,8 @@ import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.TimesTenDialect; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.type.Type; import org.hibernate.util.JoinedIterator; import org.hibernate.util.SerializationHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/FumTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -39,7 +39,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.PointbaseDialect; import org.hibernate.dialect.TimesTenDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.transform.Transformers; import org.hibernate.type.DateType; import org.hibernate.type.EntityType; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJ2Test.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJ2Test.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJ2Test.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,7 +7,7 @@ import org.hibernate.LockMode; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/IJTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,7 +8,7 @@ import org.hibernate.LockMode; import org.hibernate.classic.Session; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/LegacyTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.hql.classic.ClassicQueryTranslatorFactory; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.util.StringHelper; -import org.hibernate.junit.functional.FunctionalTestCase; import org.hibernate.dialect.Dialect; import org.hibernate.classic.Session; import org.hibernate.type.Type; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MapTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.criterion.Example; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; public class MapTest extends LegacyTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MasterDetailTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -23,7 +23,7 @@ import org.hibernate.dialect.MckoiDialect; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.SAPDBDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.mapping.MetaAttribute; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/MultiTableTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -18,7 +18,7 @@ import org.hibernate.classic.Session; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; public class MultiTableTest extends LegacyTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.mapping.MetaAttribute; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; public class NonReflectiveBinderTest extends UnitTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/OneToOneCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,7 +8,7 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Simple testcase to illustrate HB-992 Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/ParentChildTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -30,7 +30,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.engine.EntityEntry; import org.hibernate.impl.SessionImpl; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/QueryByExampleTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,7 +10,7 @@ import org.hibernate.classic.Session; import org.hibernate.criterion.Example; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Query by example test to allow nested components Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -52,7 +52,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.dialect.function.SQLFunction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; public class SQLFunctionsTest extends LegacyTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -16,7 +16,7 @@ import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.TimesTenDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; public class SQLLoaderTest extends LegacyTestCase { Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/StatisticsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/StatisticsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/StatisticsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,7 +7,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.Statistics; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/BlobLocatorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/BlobLocatorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/BlobLocatorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -34,8 +34,8 @@ import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.util.ArrayHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ClobLocatorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ClobLocatorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ClobLocatorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -31,8 +31,8 @@ import org.hibernate.Session; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests lazy materialization of data mapped by Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ImageTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ImageTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/ImageTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests eager materialization and mutation of data mapped by Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongByteArrayTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongByteArrayTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongByteArrayTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import junit.framework.AssertionFailedError; import org.hibernate.Session; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; import org.hibernate.util.ArrayHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongStringTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongStringTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/LongStringTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -25,11 +25,8 @@ */ package org.hibernate.test.lob; -import junit.framework.Test; - import org.hibernate.Session; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; /** * Tests eager materialization and mutation of long strings. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedBlobTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedBlobTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedBlobTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.dialect.Dialect; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedClobTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedClobTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/MaterializedClobTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.dialect.Dialect; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/SerializableTypeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,13 +4,8 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.SybaseDialect; -import org.hibernate.dialect.Sybase11Dialect; -import org.hibernate.dialect.SybaseASE15Dialect; -import org.hibernate.dialect.SybaseAnywhereDialect; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests of {@link org.hibernate.type.SerializableType} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/lob/TextTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/lob/TextTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/lob/TextTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Test eager materialization and mutation data mapped by Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/batchload/BatchedManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -22,20 +22,17 @@ package org.hibernate.test.manytomany.batchload; import java.util.List; -import java.sql.PreparedStatement; -import java.sql.SQLException; import junit.framework.Test; import junit.framework.Assert; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.Session; import org.hibernate.Hibernate; import org.hibernate.Interceptor; -import org.hibernate.HibernateException; import org.hibernate.EmptyInterceptor; import org.hibernate.jdbc.BatcherFactory; import org.hibernate.jdbc.NonBatchingBatcher; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/ordered/OrderedManyToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import java.util.HashSet; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * Abstract class for tests on many-to-many association using an association class. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/compositeid/ManyToManyAssociationClassCompositeIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -28,7 +28,7 @@ import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest; import org.hibernate.test.manytomanyassociationclass.Membership; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests on many-to-many association using an association class with a composite ID containing Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/assigned/ManyToManyAssociationClassAssignedIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -28,7 +28,7 @@ import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest; import org.hibernate.test.manytomanyassociationclass.Membership; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests on many-to-many association using an association class with a surrogate ID that is assigned. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomanyassociationclass/surrogateid/generated/ManyToManyAssociationClassGeneratedIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -32,7 +32,7 @@ import org.hibernate.test.manytomanyassociationclass.AbstractManyToManyAssociationClassTest; import org.hibernate.test.manytomanyassociationclass.Membership; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests on many-to-many association using an association class with a surrogate ID that is generated. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/map/MapIndexFormulaTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/map/MapIndexFormulaTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/map/MapIndexFormulaTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,7 +13,7 @@ import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Subclass; import org.hibernate.mapping.UnionSubclass; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * @author max Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.hibernate.mapping.ValueVisitor; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * @author max Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mappingexception/MappingExceptionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/mappingexception/MappingExceptionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/mappingexception/MappingExceptionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -19,7 +19,7 @@ import org.hibernate.MappingException; import org.hibernate.MappingNotFoundException; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.util.ConfigHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/mixed/MixedTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,8 +27,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,8 +1,7 @@ package org.hibernate.test.namingstrategy; import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -36,7 +36,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * @author Alex Burgel Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -23,8 +23,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,9 +13,9 @@ import org.hibernate.engine.NonFlushedChanges; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.StatefulPersistenceContext; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.test.tm.ConnectionProviderImpl; -import org.hibernate.test.tm.TransactionManagerLookupImpl; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.tm.ConnectionProviderImpl; +import org.hibernate.testing.tm.TransactionManagerLookupImpl; import org.hibernate.transaction.CMTTransactionFactory; import org.hibernate.util.SerializationHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/CreateTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.PersistentObjectException; import org.hibernate.Session; import org.hibernate.exception.ConstraintViolationException; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; /** * @author Gavin King, Gail Badner (adapted this from "ops" tests version) Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/DeleteTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/DeleteTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/DeleteTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,8 +3,8 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,9 +10,8 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.Session; import org.hibernate.StaleObjectStateException; import org.hibernate.criterion.Projections; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; /** * @author Gavin King, Gail Badner (adapted this from "ops" tests version) Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,9 +10,9 @@ import org.hibernate.cfg.Environment; import org.hibernate.criterion.Projections; import org.hibernate.intercept.FieldInterceptionHelper; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.test.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; /** * @author Gavin King, Gail Badner (adapted this from "ops" tests version) Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ondelete/OnDeleteTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,10 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.dialect.MySQLDialect; -import org.hibernate.dialect.MySQLInnoDBDialect; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.Statistics; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,13 +26,10 @@ import java.util.ArrayList; -import junit.framework.Test; - import org.hibernate.CacheMode; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * @author Burkhard Graves, Gail Badner Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import junit.framework.Test; import org.hibernate.CacheMode; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Burkhard Graves, Gail Badner Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetomany/RecursiveBidirectionalOneToManyNoCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,10 +27,7 @@ import junit.framework.Test; import org.hibernate.CacheMode; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Burkhard Graves, Gail Badner Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Property; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.EntityStatistics; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.EntityStatistics; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.Session; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.EntityStatistics; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,7 +2,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/CreateTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,7 +9,7 @@ import org.hibernate.PersistentObjectException; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.exception.ConstraintViolationException; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/DeleteTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/DeleteTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/DeleteTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * {@inheritDoc} Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/GetLoadTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/MergeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.StaleObjectStateException; import org.hibernate.Transaction; import org.hibernate.criterion.Projections; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ops/SaveOrUpdateTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.HibernateException; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.intercept.FieldInterceptionHelper; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/optlock/OptimisticLockTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.StaleObjectStateException; import org.hibernate.StaleStateException; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests relating to the optimisitc-lock mapping option. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ordered/OrderByTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ordered/OrderByTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ordered/OrderByTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/OrphanTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/OrphanTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/OrphanTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.util.SerializationHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/PropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/PropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/PropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * TODO : javadoc Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/pagination/PaginationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,8 +33,8 @@ import org.hibernate.Query; import org.hibernate.Criteria; import org.hibernate.criterion.Order; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -12,8 +12,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.mapping.Column; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.PersistentClass; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,8 +5,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/proxy/ProxyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -16,8 +16,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.impl.SessionImpl; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; import org.hibernate.util.SerializationHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/querycache/QueryCacheTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -12,8 +12,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.QueryStatistics; import org.hibernate.transform.Transformers; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -29,7 +29,7 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.HQLQueryPlan; import org.hibernate.engine.query.QueryPlanCache; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -24,17 +24,12 @@ */ package org.hibernate.test.queryplan; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.engine.query.NativeSQLQueryPlan; import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.type.TypeFactory; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * Tests equals() for NativeSQLQueryReturn implementations. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -32,8 +32,7 @@ import org.hibernate.engine.query.sql.NativeSQLQueryReturn; import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.type.TypeFactory; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * Tests equals() and hashCode() for NativeSQLQueryReturn implementations. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -27,7 +27,7 @@ import org.hibernate.CacheMode; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,15 +1,11 @@ //$Id: CriteriaQueryTest.java 10976 2006-12-12 23:22:26Z steve.ebersole(a)jboss.com $ package org.hibernate.test.readonly; -import java.util.Iterator; import java.util.List; -import java.util.Map; import junit.framework.Test; -import org.hibernate.CacheMode; import org.hibernate.Criteria; -import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; import org.hibernate.Session; @@ -17,23 +13,13 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.DetachedCriteria; -import org.hibernate.criterion.Example; -import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projection; -import org.hibernate.criterion.Projections; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Subqueries; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; -import org.hibernate.test.hql.Animal; -import org.hibernate.test.hql.Reptile; -import org.hibernate.test.readonly.AbstractReadOnlyTest; -import org.hibernate.transform.Transformers; -import org.hibernate.type.Type; import org.hibernate.util.SerializationHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,14 +26,11 @@ package org.hibernate.test.readonly; import java.math.BigDecimal; -import java.util.List; import junit.framework.Test; import org.hibernate.CacheMode; import org.hibernate.Hibernate; -import org.hibernate.ScrollMode; -import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.TransientObjectException; @@ -42,10 +39,7 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Tests making initialized and uninitialized proxies read-only/modifiable Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -34,16 +34,12 @@ import junit.framework.Test; -import org.hibernate.CacheMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.proxy.HibernateProxy; import org.hibernate.engine.SessionImplementor; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Model: Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlySessionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -38,10 +38,7 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.proxy.HibernateProxy; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,21 +26,16 @@ package org.hibernate.test.readonly; import java.math.BigDecimal; -import java.util.Iterator; import java.util.List; import junit.framework.Test; -import org.hibernate.CacheMode; import org.hibernate.Hibernate; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -28,10 +28,7 @@ import junit.framework.Test; import org.hibernate.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gail Badner Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,7 +33,7 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.transform.ResultTransformer; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/rowid/RowIdTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -12,8 +12,8 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import junit.framework.TestSuite; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sorted/SortTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sorted/SortTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sorted/SortTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * todo: describe OracleCheckStyleTest Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.Session; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; /** * todo: describe ResultCheckStyleTest Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,7 +13,7 @@ import org.hibernate.test.sql.hand.Person; import org.hibernate.test.sql.hand.TextHolder; import org.hibernate.test.sql.hand.ImageHolder; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; /** * Abstract test case defining tests for the support for user-supplied (aka Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import org.hibernate.dialect.DataDirectOracle9Dialect; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Oracle9iDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -25,7 +25,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,7 +8,7 @@ import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseAnywhereDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -1,8 +1,9 @@ package org.hibernate.test.sql.hand.identity; import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; + +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.dialect.Dialect; import org.hibernate.Session; import org.hibernate.JDBCException; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -30,11 +30,10 @@ import org.hibernate.test.sql.hand.ImageHolder; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.transform.DistinctRootEntityResultTransformer; import org.hibernate.transform.Transformers; -import org.hibernate.transform.AliasToEntityMapResultTransformer; import org.hibernate.transform.BasicTransformerAdapter; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import org.hibernate.SQLQuery; import org.hibernate.Session; import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; /** * Test of various situations with native-sql queries and quoted identifiers Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -33,7 +33,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/StatelessSessionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.ScrollableResults; import org.hibernate.StatelessSession; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -25,8 +25,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.DefaultNamingStrategy; import org.hibernate.util.StringHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/stats/SessionStatsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/stats/SessionStatsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/stats/SessionStatsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.stat.SessionStatistics; import org.hibernate.stat.Statistics; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/stats/StatsTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/stats/StatsTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/stats/StatsTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,8 +14,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.mapping.Collection; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.Statistics; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Transaction; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of DiscrimSubclassFilterTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Transaction; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of JoinedSubclassFilterTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -10,8 +10,8 @@ import org.hibernate.Transaction; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of DiscrimSubclassFilterTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/subselect/SubselectTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/subselect/SubselectTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/subselect/SubselectTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/ternary/TernaryTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/ternary/TernaryTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/ternary/TernaryTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/timestamp/TimestampTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/timestamp/TimestampTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/timestamp/TimestampTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/tm/CMTTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -16,8 +16,11 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Order; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.tm.ConnectionProviderImpl; +import org.hibernate.testing.tm.SimpleJtaTransactionManagerImpl; +import org.hibernate.testing.tm.TransactionManagerLookupImpl; import org.hibernate.transaction.CMTTransactionFactory; import org.hibernate.util.SerializationHelper; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/typeparameters/TypeParameterTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/typeparameters/TypeParameterTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/typeparameters/TypeParameterTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Test for parameterizable types. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/unconstrained/UnconstrainedTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/unconstrained/UnconstrainedTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/unconstrained/UnconstrainedTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/unidir/BackrefTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/unidir/BackrefTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/unidir/BackrefTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -12,8 +12,8 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Order; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -26,7 +26,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; /** * http://opensource.atlassian.com/projects/hibernate/browse/HHH-4825 Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -13,8 +13,8 @@ import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Gavin King Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/basic/UserCollectionTypeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/basic/UserCollectionTypeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/basic/UserCollectionTypeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Max Rydahl Andersen Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/usercollection/parameterized/ParameterizedUserCollectionTypeTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -2,8 +2,8 @@ import junit.framework.Test; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.Hibernate; Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -5,7 +5,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.util.PropertiesHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/util/StringHelperTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/util/StringHelperTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/util/StringHelperTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -3,7 +3,7 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.util.StringHelper; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -4,7 +4,7 @@ import junit.framework.TestSuite; import org.hibernate.cfg.Configuration; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/version/VersionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/version/VersionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/version/VersionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Max Rydahl Andersen Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/version/db/DbVersionTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/version/db/DbVersionTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/version/db/DbVersionTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -8,8 +8,8 @@ import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of DbVersionTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -9,8 +9,8 @@ import org.hibernate.Transaction; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * Implementation of VersionTest. Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/where/WhereTest.java =================================================================== --- core/trunk/testsuite/src/test/java/org/hibernate/test/where/WhereTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/java/org/hibernate/test/where/WhereTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -6,8 +6,8 @@ import org.hibernate.FetchMode; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; /** * @author Max Rydahl Andersen Modified: core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/ConfigurationPerformanceTest.java =================================================================== --- core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/ConfigurationPerformanceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/ConfigurationPerformanceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -38,7 +38,7 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.classic.Session; -import org.hibernate.junit.UnitTestCase; +import org.hibernate.testing.junit.UnitTestCase; /** * Test of configuration, specifically "cacheable files". Modified: core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewPerformanceTest.java =================================================================== --- core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewPerformanceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewPerformanceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -7,8 +7,8 @@ import junit.textui.TestRunner; import org.hibernate.classic.Session; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.legacy.Simple; public class NewPerformanceTest extends FunctionalTestCase { Modified: core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewerPerformanceTest.java =================================================================== --- core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewerPerformanceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/NewerPerformanceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -15,8 +15,8 @@ import org.hibernate.classic.Session; import org.hibernate.connection.ConnectionProvider; import org.hibernate.connection.ConnectionProviderFactory; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.test.legacy.Simple; public class NewerPerformanceTest extends FunctionalTestCase { Modified: core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/PerformanceTest.java =================================================================== --- core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/PerformanceTest.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/perf/org/hibernate/test/perf/PerformanceTest.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -14,7 +14,7 @@ import org.hibernate.classic.Session; import org.hibernate.connection.ConnectionProvider; import org.hibernate.connection.ConnectionProviderFactory; -import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestCase; import org.hibernate.test.legacy.Simple; public class PerformanceTest extends FunctionalTestCase { Modified: core/trunk/testsuite/src/test/unmaintained/org/hibernate/test/tool/TestSchemaTools.java =================================================================== --- core/trunk/testsuite/src/test/unmaintained/org/hibernate/test/tool/TestSchemaTools.java 2010-07-07 16:39:35 UTC (rev 19909) +++ core/trunk/testsuite/src/test/unmaintained/org/hibernate/test/tool/TestSchemaTools.java 2010-07-07 19:39:23 UTC (rev 19910) @@ -11,8 +11,8 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.testing.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.testing.junit.functional.FunctionalTestClassTestSuite; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.hibernate.tool.hbm2ddl.SchemaValidator;