From 98e68aab4bb29b79b1b0e394b8069fa12516000b Mon Sep 17 00:00:00 2001 From: Strong Liu Date: Tue, 18 Oct 2011 21:47:19 +0800 Subject: [PATCH] HHH-6742 move unit tests back to src/test --- .../DriverManagerConnectionProviderImpl.java | 15 +- .../hibernate/tool/hbm2ddl/SchemaExport.java | 8 +- .../test/annotations/access/AccessTest.java | 10 +- .../access/jpa/AccessMappingTest.java | 219 -------------- .../bytecode/ProxyBreakingTest.java | 5 - .../org/hibernate/test/hql/HqlParserTest.java | 123 ++++---- .../instrument/cases/AbstractExecutable.java | 4 +- .../hibernate/test/legacy/LegacyTestCase.java | 2 +- .../SequenceHiLoGeneratorNoIncrementTest.java | 25 +- .../org/hibernate/test/annotations/A320.java | 0 .../org/hibernate/test/annotations/A320b.java | 0 .../AlternativeNamingStrategy.java | 0 .../test/annotations/AmericaCupClass.java | 0 .../org/hibernate/test/annotations/Boat.java | 0 .../hibernate/test/annotations/Company.java | 0 .../test/annotations/ConfigurationTest.java | 45 +-- .../hibernate/test/annotations/Country.java | 0 .../hibernate/test/annotations/Customer.java | 0 .../hibernate/test/annotations/Discount.java | 0 .../org/hibernate/test/annotations/Ferry.java | 0 .../hibernate/test/annotations/Flight.java | 0 .../test/annotations/FlyingObject.java | 0 .../test/annotations/IncorrectEntity.java | 0 .../hibernate/test/annotations/Passport.java | 0 .../org/hibernate/test/annotations/Plane.java | 0 .../org/hibernate/test/annotations/Port.java | 0 .../test/annotations/SafeMappingTest.java | 9 +- .../test/annotations/SecuredBindingTest.java | 15 +- .../org/hibernate/test/annotations/Sky.java | 0 .../org/hibernate/test/annotations/Thing.java | 0 .../hibernate/test/annotations/Ticket.java | 0 .../test/annotations/TicketComparator.java | 0 .../access/jpa/AccessMappingTest.java | 233 +++++++++++++++ .../test/annotations/access/jpa/Animal.java | 0 .../test/annotations/access/jpa/Bed.java | 0 .../test/annotations/access/jpa/Being.java | 0 .../test/annotations/access/jpa/BigBed.java | 0 .../test/annotations/access/jpa/Chair.java | 0 .../test/annotations/access/jpa/Circle.java | 0 .../test/annotations/access/jpa/Color.java | 0 .../test/annotations/access/jpa/Course1.java | 0 .../test/annotations/access/jpa/Course2.java | 0 .../test/annotations/access/jpa/Course3.java | 0 .../test/annotations/access/jpa/Course4.java | 0 .../test/annotations/access/jpa/Course5.java | 0 .../test/annotations/access/jpa/Course6.java | 0 .../test/annotations/access/jpa/Course7.java | 0 .../test/annotations/access/jpa/Course8.java | 0 .../annotations/access/jpa/Furniture.java | 0 .../annotations/access/jpa/Gardenshed.java | 0 .../test/annotations/access/jpa/Horse.java | 0 .../test/annotations/access/jpa/Person.java | 0 .../test/annotations/access/jpa/Position.java | 0 .../test/annotations/access/jpa/Shape.java | 0 .../test/annotations/access/jpa/Square.java | 0 .../test/annotations/access/jpa/Student.java | 0 .../test/annotations/access/jpa/Thingy.java | 0 .../test/annotations/access/jpa/User.java | 0 .../test/annotations/access/jpa/Woody.java | 0 .../test/annotations/access/xml/Boy.java | 0 .../test/annotations/access/xml/Cook.java | 0 .../test/annotations/access/xml/Crew.java | 0 .../test/annotations/access/xml/Driver.java | 0 .../test/annotations/access/xml/Knive.java | 0 .../annotations/access/xml/RentalCar.java | 0 .../test/annotations/access/xml/Tourist.java | 0 .../test/annotations/access/xml/Waiter.java | 0 .../annotations/access/xml/XmlAccessTest.java | 0 .../annotations/backquotes/BackquoteTest.java | 7 +- .../test/annotations/backquotes/Bug.java | 0 .../test/annotations/backquotes/Category.java | 0 .../test/annotations/backquotes/Printer.java | 0 .../annotations/backquotes/PrinterCable.java | 0 .../deepcollectionelements/A.java | 0 .../deepcollectionelements/B.java | 0 .../deepcollectionelements/C.java | 0 .../DeepCollectionElementTest.java | 0 .../configuration/ConfigurationTest.java | 8 +- .../configuration/package-info.java | 0 .../duplicatedgenerator/DuplicateTest.java | 7 +- .../duplicatedgenerator/Flight.java | 0 .../annotations/fetchprofile/Country.java | 0 .../annotations/fetchprofile/Customer.java | 0 .../annotations/fetchprofile/Customer2.java | 0 .../annotations/fetchprofile/Customer3.java | 0 .../annotations/fetchprofile/Customer4.java | 0 .../annotations/fetchprofile/Customer5.java | 0 .../fetchprofile/FetchProfileTest.java | 0 .../fetchprofile/MoreFetchProfileTest.java | 0 .../test/annotations/fetchprofile/Order.java | 0 .../fetchprofile/SupportTickets.java | 0 .../fetchprofile/package-info.java | 0 .../test/annotations/fkcircularity/A.java | 0 .../test/annotations/fkcircularity/A_PK.java | 0 .../test/annotations/fkcircularity/B.java | 0 .../test/annotations/fkcircularity/C.java | 0 .../annotations/fkcircularity/ClassA.java | 0 .../annotations/fkcircularity/ClassB.java | 0 .../annotations/fkcircularity/ClassC.java | 0 .../annotations/fkcircularity/ClassD.java | 0 .../test/annotations/fkcircularity/D.java | 0 .../test/annotations/fkcircularity/D_PK.java | 0 .../fkcircularity/FkCircularityTest.java | 31 +- .../id/JoinColumnOverrideTest.java | 0 .../test/annotations/id/UUIDGenerator.java | 0 .../test/annotations/id/entities/Ball.java | 0 .../annotations/id/entities/BreakDance.java | 0 .../test/annotations/id/entities/Bunny.java | 0 .../annotations/id/entities/Computer.java | 0 .../annotations/id/entities/Department.java | 0 .../test/annotations/id/entities/Dog.java | 0 .../test/annotations/id/entities/FirTree.java | 0 .../annotations/id/entities/Footballer.java | 0 .../annotations/id/entities/FootballerPk.java | 0 .../annotations/id/entities/Furniture.java | 0 .../annotations/id/entities/GoalKeeper.java | 0 .../test/annotations/id/entities/Home.java | 0 .../annotations/id/entities/Location.java | 0 .../id/entities/MilitaryBuilding.java | 0 .../test/annotations/id/entities/Monkey.java | 0 .../test/annotations/id/entities/Phone.java | 0 .../test/annotations/id/entities/Planet.java | 0 .../id/entities/PlanetCheatSheet.java | 0 .../annotations/id/entities/PointyTooth.java | 0 .../test/annotations/id/entities/Shoe.java | 0 .../annotations/id/entities/SoundSystem.java | 0 .../test/annotations/id/entities/Store.java | 0 .../test/annotations/id/entities/Tower.java | 0 .../test/annotations/id/entities/Tree.java | 0 .../annotations/id/entities/TwinkleToes.java | 0 .../test/annotations/id/package-info.java | 0 .../discriminatoroptions/BaseClass.java | 0 .../DiscriminatorOptionsTest.java | 0 .../discriminatoroptions/SubClass.java | 0 .../test/annotations/namingstrategy/A.java | 0 .../annotations/namingstrategy/Address.java | 0 .../namingstrategy/AddressEntry.java | 0 .../namingstrategy/DummyNamingStrategy.java | 0 .../namingstrategy/NamingStrategyTest.java | 21 +- .../annotations/namingstrategy/Person.java | 0 .../test/annotations/onetoone/Address.java | 0 .../test/annotations/onetoone/Body.java | 0 .../test/annotations/onetoone/Client.java | 0 .../test/annotations/onetoone/Computer.java | 0 .../test/annotations/onetoone/ComputerPk.java | 0 .../test/annotations/onetoone/Father.java | 0 .../test/annotations/onetoone/Heart.java | 0 .../onetoone/OneToOneErrorTest.java | 8 +- .../test/annotations/onetoone/Owner.java | 0 .../annotations/onetoone/OwnerAddress.java | 0 .../test/annotations/onetoone/Party.java | 0 .../annotations/onetoone/PartyAffiliate.java | 0 .../test/annotations/onetoone/Person.java | 0 .../annotations/onetoone/PersonAddress.java | 0 .../annotations/onetoone/SerialNumber.java | 0 .../annotations/onetoone/SerialNumberPk.java | 0 .../test/annotations/onetoone/Show.java | 0 .../annotations/onetoone/ShowDescription.java | 0 .../test/annotations/onetoone/Son.java | 0 .../test/annotations/onetoone/Trousers.java | 0 .../annotations/onetoone/TrousersZip.java | 0 .../onetoone/primarykey/Address.java | 0 .../primarykey/NullablePrimaryKeyTest.java | 11 +- .../onetoone/primarykey/Person.java | 0 .../reflection/Administration.java | 0 .../annotations/reflection/Availability.java | 0 .../test/annotations/reflection/BusTrip.java | 0 .../annotations/reflection/BusTripPk.java | 0 .../annotations/reflection/Competition.java | 0 .../JPAOverridenAnnotationReaderTest.java | 0 .../annotations/reflection/LogListener.java | 0 .../test/annotations/reflection/Match.java | 0 .../annotations/reflection/Organization.java | 0 .../reflection/OtherLogListener.java | 0 .../SocialSecurityMoralAccount.java | 0 .../reflection/SocialSecurityNumber.java | 0 .../SocialSecurityPhysicalAccount.java | 0 .../annotations/reflection/TennisMatch.java | 0 .../reflection/XMLContextTest.java | 10 +- .../hibernate/test/ast/ASTIteratorTest.java | 0 .../org/hibernate/test/ast/ASTUtilTest.java | 0 .../org/hibernate/test/bytecode/Bean.hbm.xml | 0 .../org/hibernate/test/bytecode/Bean.java | 0 .../test/bytecode/BeanReflectionHelper.java | 0 .../hibernate/test/bytecode/ProxyBean.java | 0 .../InvocationTargetExceptionTest.java | 0 .../javassist/ReflectionOptimizerTest.java | 0 .../org/hibernate/test/cfg/Cacheable.hbm.xml | 0 .../hibernate/test/cfg/CacheableFileTest.java | 0 .../cfg/ConfigurationSerializationTest.java | 0 .../hibernate/test/cfg/orm-serializable.xml | 0 .../hibernate/test/cfg/persister/Gate.java | 0 .../test/cfg/persister/GoofyException.java | 0 .../GoofyPersisterClassProvider.java | 0 .../test/cfg/persister/Palmtree.java | 0 .../persister/PersisterClassProviderTest.java | 0 .../hibernate/test/cfg/persister/Portal.java | 0 .../hibernate/test/cfg/persister/Tree.java | 0 .../hibernate/test/cfg/persister/Window.java | 0 .../AnsiTrimEmulationFunctionTest.java | 11 +- .../test/dialect/function/Product.hbm.xml | 0 .../test/dialect/function/Product.java | 0 .../unit/lockhint/AbstractLockHintTest.java | 0 .../unit/lockhint/SQLServerLockHintsTest.java | 0 .../lockhint/SybaseASE15LockHintsTest.java | 0 .../unit/lockhint/SybaseLockHintsTest.java | 0 .../test/extendshbm/Customer.hbm.xml | 0 .../hibernate/test/extendshbm/Customer.java | 0 .../test/extendshbm/Employee.hbm.xml | 0 .../hibernate/test/extendshbm/Employee.java | 0 .../test/extendshbm/ExtendsTest.java | 0 .../hibernate/test/extendshbm/Person.hbm.xml | 0 .../org/hibernate/test/extendshbm/Person.java | 0 .../test/extendshbm/allinone.hbm.xml | 0 .../test/extendshbm/allseparateinone.hbm.xml | 0 .../test/extendshbm/entitynames.hbm.xml | 0 .../extendshbm/packageentitynames.hbm.xml | 0 .../test/extendshbm/unionsubclass.hbm.xml | 0 .../java/org/hibernate/test/legacy/A.java | 0 .../org/hibernate/test/legacy/ABC.hbm.xml | 0 .../hibernate/test/legacy/ABCExtends.hbm.xml | 0 .../hibernate/test/legacy/ABCProxy.hbm.xml | 0 .../org/hibernate/test/legacy/Abstract.java | 0 .../hibernate/test/legacy/AbstractProxy.java | 0 .../hibernate/test/legacy/AltSimple.hbm.xml | 0 .../org/hibernate/test/legacy/Assignable.java | 0 .../java/org/hibernate/test/legacy/B.java | 0 .../java/org/hibernate/test/legacy/Bar.java | 0 .../org/hibernate/test/legacy/BarProxy.java | 0 .../hibernate/test/legacy/BasicNameable.java | 0 .../org/hibernate/test/legacy/Baz.hbm.xml | 0 .../java/org/hibernate/test/legacy/Baz.java | 0 .../org/hibernate/test/legacy/Blobber.hbm.xml | 0 .../org/hibernate/test/legacy/Blobber.java | 0 .../org/hibernate/test/legacy/Broken.hbm.xml | 0 .../org/hibernate/test/legacy/Broken.java | 0 .../java/org/hibernate/test/legacy/C1.java | 0 .../java/org/hibernate/test/legacy/C2.java | 0 .../hibernate/test/legacy/Category.hbm.xml | 0 .../org/hibernate/test/legacy/Category.java | 0 .../java/org/hibernate/test/legacy/Child.java | 0 .../hibernate/test/legacy/Circular.hbm.xml | 0 .../org/hibernate/test/legacy/Circular.java | 0 .../hibernate/test/legacy/Commento.hbm.xml | 0 .../org/hibernate/test/legacy/Company.java | 0 .../org/hibernate/test/legacy/Component.java | 0 .../test/legacy/ComponentCollection.java | 0 .../test/legacy/ComponentNotNull.java | 0 .../legacy/ComponentNotNullMaster.hbm.xml | 0 .../test/legacy/ComponentNotNullMaster.java | 0 .../test/legacy/Componentizable.hbm.xml | 0 .../test/legacy/Componentizable.java | 0 .../test/legacy/CompositeElement.java | 0 .../test/legacy/CompositeIdId.hbm.xml | 0 .../hibernate/test/legacy/CompositeIdId.java | 0 .../org/hibernate/test/legacy/Contained.java | 0 .../hibernate/test/legacy/Container.hbm.xml | 0 .../org/hibernate/test/legacy/Container.java | 0 .../org/hibernate/test/legacy/Custom.hbm.xml | 0 .../org/hibernate/test/legacy/Custom.java | 0 .../test/legacy/CustomPersister.java | 0 .../hibernate/test/legacy/CustomSQL.hbm.xml | 0 .../java/org/hibernate/test/legacy/D.java | 0 .../org/hibernate/test/legacy/Detail.java | 0 .../test/legacy/DoubleStringType.java | 0 .../java/org/hibernate/test/legacy/Down.java | 0 .../java/org/hibernate/test/legacy/Drug.java | 0 .../java/org/hibernate/test/legacy/E.java | 0 .../org/hibernate/test/legacy/Eye.hbm.xml | 0 .../java/org/hibernate/test/legacy/Eye.java | 0 .../org/hibernate/test/legacy/Fee.hbm.xml | 0 .../java/org/hibernate/test/legacy/Fee.java | 0 .../java/org/hibernate/test/legacy/Fixed.java | 0 .../java/org/hibernate/test/legacy/Fo.hbm.xml | 0 .../java/org/hibernate/test/legacy/Fo.java | 0 .../java/org/hibernate/test/legacy/Foo.java | 0 .../org/hibernate/test/legacy/FooBar.hbm.xml | 0 .../hibernate/test/legacy/FooComponent.java | 0 .../org/hibernate/test/legacy/FooProxy.java | 0 .../org/hibernate/test/legacy/Fum.hbm.xml | 0 .../java/org/hibernate/test/legacy/Fum.java | 0 .../hibernate/test/legacy/FumCompositeID.java | 0 .../org/hibernate/test/legacy/Fumm.hbm.xml | 0 .../java/org/hibernate/test/legacy/Fumm.java | 0 .../org/hibernate/test/legacy/Glarch.hbm.xml | 0 .../org/hibernate/test/legacy/Glarch.java | 0 .../hibernate/test/legacy/GlarchProxy.java | 0 .../org/hibernate/test/legacy/Holder.hbm.xml | 0 .../org/hibernate/test/legacy/Holder.java | 0 .../java/org/hibernate/test/legacy/I.java | 0 .../java/org/hibernate/test/legacy/IJ.hbm.xml | 0 .../org/hibernate/test/legacy/IJ2.hbm.xml | 0 .../hibernate/test/legacy/Immutable.hbm.xml | 0 .../org/hibernate/test/legacy/Immutable.java | 0 .../java/org/hibernate/test/legacy/Inner.java | 0 .../org/hibernate/test/legacy/InnerKey.java | 0 .../hibernate/test/legacy/Intervention.java | 0 .../java/org/hibernate/test/legacy/J.java | 0 .../java/org/hibernate/test/legacy/Jay.java | 0 .../java/org/hibernate/test/legacy/K.java | 0 .../hibernate/test/legacy/Location.hbm.xml | 0 .../org/hibernate/test/legacy/Location.java | 0 .../java/org/hibernate/test/legacy/Lower.java | 0 .../hibernate/test/legacy/MainObject.hbm.xml | 0 .../org/hibernate/test/legacy/MainObject.java | 0 .../org/hibernate/test/legacy/Many.hbm.xml | 0 .../java/org/hibernate/test/legacy/Many.java | 0 .../org/hibernate/test/legacy/Map.hbm.xml | 0 .../org/hibernate/test/legacy/Marelo.hbm.xml | 0 .../org/hibernate/test/legacy/Master.java | 0 .../test/legacy/MasterDetail.hbm.xml | 0 .../org/hibernate/test/legacy/Medication.java | 0 .../org/hibernate/test/legacy/Middle.hbm.xml | 0 .../org/hibernate/test/legacy/Middle.java | 0 .../org/hibernate/test/legacy/MiddleKey.java | 0 .../java/org/hibernate/test/legacy/Mono.java | 0 .../org/hibernate/test/legacy/MoreStuff.java | 0 .../org/hibernate/test/legacy/Multi.hbm.xml | 0 .../java/org/hibernate/test/legacy/Multi.java | 0 .../test/legacy/MultiExtends.hbm.xml | 0 .../hibernate/test/legacy/Multiplicity.java | 0 .../test/legacy/MultiplicityType.java | 0 .../hibernate/test/legacy/Nameable.hbm.xml | 0 .../org/hibernate/test/legacy/Nameable.java | 0 .../java/org/hibernate/test/legacy/Named.java | 0 .../test/legacy/NestingComponent.java | 0 .../test/legacy/NonReflectiveBinderTest.java | 0 .../org/hibernate/test/legacy/Object2.hbm.xml | 0 .../org/hibernate/test/legacy/Object2.java | 0 .../org/hibernate/test/legacy/One.hbm.xml | 0 .../java/org/hibernate/test/legacy/One.java | 0 .../java/org/hibernate/test/legacy/Outer.java | 0 .../org/hibernate/test/legacy/OuterKey.java | 0 .../org/hibernate/test/legacy/Parent.java | 0 .../hibernate/test/legacy/ParentChild.hbm.xml | 0 .../java/org/hibernate/test/legacy/Part.java | 0 .../java/org/hibernate/test/legacy/Party.java | 0 .../org/hibernate/test/legacy/Person.java | 0 .../java/org/hibernate/test/legacy/Po.java | 0 .../org/hibernate/test/legacy/Qux.hbm.xml | 0 .../java/org/hibernate/test/legacy/Qux.java | 0 .../org/hibernate/test/legacy/Resource.java | 0 .../org/hibernate/test/legacy/Result.java | 0 .../test/legacy/ReverseComparator.java | 0 .../java/org/hibernate/test/legacy/Role.java | 0 .../java/org/hibernate/test/legacy/S.java | 0 .../org/hibernate/test/legacy/Several.java | 0 .../org/hibernate/test/legacy/Simple.hbm.xml | 0 .../org/hibernate/test/legacy/Simple.java | 0 .../org/hibernate/test/legacy/Single.java | 0 .../test/legacy/SingleSeveral.hbm.xml | 0 .../org/hibernate/test/legacy/Sortable.java | 0 .../test/legacy/StringComparator.java | 0 .../org/hibernate/test/legacy/Stuff.hbm.xml | 0 .../java/org/hibernate/test/legacy/Stuff.java | 0 .../hibernate/test/legacy/SubComponent.java | 0 .../org/hibernate/test/legacy/SubDetail.java | 0 .../org/hibernate/test/legacy/SubMulti.java | 0 .../java/org/hibernate/test/legacy/Super.java | 0 .../java/org/hibernate/test/legacy/Top.java | 0 .../org/hibernate/test/legacy/Trivial.java | 0 .../hibernate/test/legacy/TrivialClass.java | 0 .../java/org/hibernate/test/legacy/Up.java | 0 .../org/hibernate/test/legacy/UpDown.hbm.xml | 0 .../org/hibernate/test/legacy/Vetoer.hbm.xml | 0 .../org/hibernate/test/legacy/Vetoer.java | 0 .../java/org/hibernate/test/legacy/W.java | 0 .../java/org/hibernate/test/legacy/WZ.hbm.xml | 0 .../org/hibernate/test/legacy/Wicked.hbm.xml | 0 .../java/org/hibernate/test/legacy/X.java | 0 .../java/org/hibernate/test/legacy/XY.hbm.xml | 0 .../java/org/hibernate/test/legacy/Y.java | 0 .../java/org/hibernate/test/legacy/Z.java | 0 .../mapping/PersistentClassVisitorTest.java | 0 .../test/mapping/ValueVisitorTest.java | 0 .../mappingexception/InvalidMapping.hbm.xml | 0 .../test/mappingexception/InvalidMapping.java | 0 .../MappingExceptionTest.java | 0 .../test/mappingexception/User.hbm.xml | 0 .../hibernate/test/mappingexception/User.java | 0 .../test/schemaupdate/1_Version.hbm.xml | 0 .../test/schemaupdate/2_Version.hbm.xml | 0 .../test/schemaupdate/MigrationTest.java | 0 .../SchemaExportManagedConnectionTest.java | 0 .../SchemaExportSuppliedConnectionTest.java | 0 .../test/schemaupdate/SchemaExportTest.java | 13 +- .../hibernate/test/schemaupdate/Version.java | 0 .../test/schemaupdate/mapping.hbm.xml | 0 .../test/util/JoinedIterableTest.java | 0 .../test/util/PropertiesHelperTest.java | 0 .../org/hibernate/test/util/dtd/Child.java | 0 .../test/util/dtd/EntityResolverTest.java | 0 .../hibernate/test/util/dtd/Parent.hbm.xml | 0 .../org/hibernate/test/util/dtd/Parent.java | 0 .../org/hibernate/test/util/dtd/child.xml | 0 .../hibernate/test/annotations/Boat.hbm.xml | 0 .../hibernate/test/annotations/Ferry.hbm.xml | 0 .../test/annotations/access/xml/Boy.xml | 0 .../test/annotations/access/xml/Cook.xml | 0 .../test/annotations/access/xml/Crew.xml | 0 .../test/annotations/access/xml/RentalCar.xml | 0 .../test/annotations/access/xml/Tourist.xml | 0 .../test/annotations/access/xml/Tourist2.xml | 0 .../test/annotations/access/xml/Tourist3.xml | 0 .../test/annotations/access/xml/Tourist4.xml | 0 .../test/annotations/bytecode/Hammer.hbm.xml | 0 .../test/annotations/configuration/orm.xml | 0 .../annotations/duplicatedgenerator/orm.xml | 0 .../annotations/fetchprofile/mappings.hbm.xml | 0 .../test/annotations/hibernate.cfg.xml | 0 .../idclass/xml/HabitatSpeciesLink.xml | 0 .../inheritance/joined/Asset.hbm.xml | 0 .../test/annotations/loader/Loader.hbm.xml | 0 .../test/annotations/onetomany/orm.xml | 0 .../test/annotations/onetoone/orm.xml | 0 .../org/hibernate/test/annotations/orm.xml | 0 .../hibernate/test/annotations/query/orm.xml | 0 .../reflection/metadata-complete.xml | 0 .../test/annotations/reflection/orm.xml | 0 .../xml/ejb3/element-collection.orm1.xml | 0 .../xml/ejb3/element-collection.orm10.xml | 0 .../xml/ejb3/element-collection.orm11.xml | 0 .../xml/ejb3/element-collection.orm12.xml | 0 .../xml/ejb3/element-collection.orm13.xml | 0 .../xml/ejb3/element-collection.orm14.xml | 0 .../xml/ejb3/element-collection.orm15.xml | 0 .../xml/ejb3/element-collection.orm16.xml | 0 .../xml/ejb3/element-collection.orm17.xml | 0 .../xml/ejb3/element-collection.orm18.xml | 0 .../xml/ejb3/element-collection.orm19.xml | 0 .../xml/ejb3/element-collection.orm2.xml | 0 .../xml/ejb3/element-collection.orm20.xml | 0 .../xml/ejb3/element-collection.orm21.xml | 0 .../xml/ejb3/element-collection.orm22.xml | 0 .../xml/ejb3/element-collection.orm23.xml | 0 .../xml/ejb3/element-collection.orm24.xml | 0 .../xml/ejb3/element-collection.orm25.xml | 0 .../xml/ejb3/element-collection.orm26.xml | 0 .../xml/ejb3/element-collection.orm27.xml | 0 .../xml/ejb3/element-collection.orm28.xml | 0 .../xml/ejb3/element-collection.orm3.xml | 0 .../xml/ejb3/element-collection.orm4.xml | 0 .../xml/ejb3/element-collection.orm5.xml | 0 .../xml/ejb3/element-collection.orm6.xml | 0 .../xml/ejb3/element-collection.orm7.xml | 0 .../xml/ejb3/element-collection.orm8.xml | 0 .../xml/ejb3/element-collection.orm9.xml | 0 .../xml/ejb3/many-to-many.orm1.xml | 0 .../xml/ejb3/many-to-many.orm10.xml | 0 .../xml/ejb3/many-to-many.orm11.xml | 0 .../xml/ejb3/many-to-many.orm12.xml | 0 .../xml/ejb3/many-to-many.orm13.xml | 0 .../xml/ejb3/many-to-many.orm14.xml | 0 .../xml/ejb3/many-to-many.orm15.xml | 0 .../xml/ejb3/many-to-many.orm16.xml | 0 .../xml/ejb3/many-to-many.orm17.xml | 0 .../xml/ejb3/many-to-many.orm18.xml | 0 .../xml/ejb3/many-to-many.orm19.xml | 0 .../xml/ejb3/many-to-many.orm2.xml | 0 .../xml/ejb3/many-to-many.orm20.xml | 0 .../xml/ejb3/many-to-many.orm21.xml | 0 .../xml/ejb3/many-to-many.orm3.xml | 0 .../xml/ejb3/many-to-many.orm4.xml | 0 .../xml/ejb3/many-to-many.orm5.xml | 0 .../xml/ejb3/many-to-many.orm6.xml | 0 .../xml/ejb3/many-to-many.orm7.xml | 0 .../xml/ejb3/many-to-many.orm8.xml | 0 .../xml/ejb3/many-to-many.orm9.xml | 0 .../annotations/xml/ejb3/many-to-one.orm1.xml | 0 .../annotations/xml/ejb3/many-to-one.orm2.xml | 0 .../annotations/xml/ejb3/many-to-one.orm3.xml | 0 .../annotations/xml/ejb3/many-to-one.orm4.xml | 0 .../annotations/xml/ejb3/many-to-one.orm5.xml | 0 .../annotations/xml/ejb3/many-to-one.orm6.xml | 0 .../annotations/xml/ejb3/many-to-one.orm7.xml | 0 .../annotations/xml/ejb3/many-to-one.orm8.xml | 0 .../annotations/xml/ejb3/many-to-one.orm9.xml | 0 .../annotations/xml/ejb3/one-to-many.orm1.xml | 0 .../xml/ejb3/one-to-many.orm10.xml | 0 .../xml/ejb3/one-to-many.orm11.xml | 0 .../xml/ejb3/one-to-many.orm12.xml | 0 .../xml/ejb3/one-to-many.orm13.xml | 0 .../xml/ejb3/one-to-many.orm14.xml | 0 .../xml/ejb3/one-to-many.orm15.xml | 0 .../xml/ejb3/one-to-many.orm16.xml | 0 .../xml/ejb3/one-to-many.orm17.xml | 0 .../xml/ejb3/one-to-many.orm18.xml | 0 .../xml/ejb3/one-to-many.orm19.xml | 0 .../annotations/xml/ejb3/one-to-many.orm2.xml | 0 .../xml/ejb3/one-to-many.orm20.xml | 0 .../xml/ejb3/one-to-many.orm21.xml | 0 .../xml/ejb3/one-to-many.orm22.xml | 0 .../xml/ejb3/one-to-many.orm23.xml | 0 .../annotations/xml/ejb3/one-to-many.orm3.xml | 0 .../annotations/xml/ejb3/one-to-many.orm4.xml | 0 .../annotations/xml/ejb3/one-to-many.orm5.xml | 0 .../annotations/xml/ejb3/one-to-many.orm6.xml | 0 .../annotations/xml/ejb3/one-to-many.orm7.xml | 0 .../annotations/xml/ejb3/one-to-many.orm8.xml | 0 .../annotations/xml/ejb3/one-to-many.orm9.xml | 0 .../annotations/xml/ejb3/one-to-one.orm1.xml | 0 .../annotations/xml/ejb3/one-to-one.orm10.xml | 0 .../annotations/xml/ejb3/one-to-one.orm11.xml | 0 .../annotations/xml/ejb3/one-to-one.orm2.xml | 0 .../annotations/xml/ejb3/one-to-one.orm3.xml | 0 .../annotations/xml/ejb3/one-to-one.orm4.xml | 0 .../annotations/xml/ejb3/one-to-one.orm5.xml | 0 .../annotations/xml/ejb3/one-to-one.orm6.xml | 0 .../annotations/xml/ejb3/one-to-one.orm7.xml | 0 .../annotations/xml/ejb3/one-to-one.orm8.xml | 0 .../annotations/xml/ejb3/one-to-one.orm9.xml | 0 .../test/annotations/xml/ejb3/orm.xml | 0 .../test/annotations/xml/ejb3/orm2.xml | 0 .../test/annotations/xml/ejb3/orm3.xml | 0 .../test/annotations/xml/ejb3/orm4.xml | 0 .../test/annotations/xml/hbm/A.hbm.xml | 0 .../test/annotations/xml/hbm/B.hbm.xml | 0 .../annotations/xml/hbm/CloudType.hbm.xml | 0 .../annotations/xml/hbm/Government.hbm.xml | 0 .../test/util/PersistenceUtilHelperTest.java | 19 +- .../connection/DataSourceInjectionTest.java | 8 +- .../ejb3configuration/InterceptorTest.java | 274 ++++++++++-------- .../PersisterClassProviderTest.java | 12 +- .../ProgrammaticConfTest.java | 14 +- .../SessionFactoryObserverTest.java | 8 +- ...entifierGeneratorStrategyProviderTest.java | 7 +- ...nterceptFieldClassFileTransformerTest.java | 9 +- .../ejb/test/jee/OrmVersionTest.java | 12 +- .../tm/JBossStandaloneJtaExampleTest.java | 19 +- .../junit4/BaseCoreFunctionalTestCase.java | 4 +- 530 files changed, 671 insertions(+), 555 deletions(-) delete mode 100644 hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/A320.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/A320b.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/AmericaCupClass.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Boat.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Company.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/ConfigurationTest.java (86%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Country.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Customer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Discount.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Ferry.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Flight.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/FlyingObject.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/IncorrectEntity.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Passport.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Plane.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Port.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/SafeMappingTest.java (82%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/SecuredBindingTest.java (82%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Sky.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Thing.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/Ticket.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/TicketComparator.java (100%) create mode 100644 hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Animal.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Bed.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Being.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/BigBed.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Chair.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Circle.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Color.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course1.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course2.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course3.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course4.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course5.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course6.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course7.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Course8.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Furniture.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Horse.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Person.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Position.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Shape.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Square.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Student.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Thingy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/User.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/jpa/Woody.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Boy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Cook.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Crew.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Driver.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Knive.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/RentalCar.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Tourist.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/Waiter.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java (90%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/backquotes/Bug.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/backquotes/Category.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/backquotes/Printer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/backquotes/PrinterCable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java (73%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/configuration/package-info.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java (87%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Country.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Customer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Customer2.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Customer3.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Customer4.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Customer5.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/Order.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fetchprofile/package-info.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/A.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/A_PK.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/B.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/C.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/ClassA.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/ClassB.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/ClassC.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/ClassD.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/D.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/D_PK.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java (81%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/UUIDGenerator.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Ball.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/BreakDance.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Bunny.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Computer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Department.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Dog.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/FirTree.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Footballer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/FootballerPk.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Furniture.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Home.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Location.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Monkey.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Phone.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Planet.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/PointyTooth.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Shoe.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/SoundSystem.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Store.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Tower.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/Tree.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/id/package-info.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/namingstrategy/A.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/namingstrategy/Address.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java (92%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/namingstrategy/Person.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Address.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Body.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Client.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Computer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/ComputerPk.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Father.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Heart.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java (85%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Owner.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Party.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Person.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/PersonAddress.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/SerialNumber.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Show.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/ShowDescription.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Son.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/Trousers.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/TrousersZip.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java (87%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/Administration.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/Availability.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/BusTrip.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/BusTripPk.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/Competition.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/LogListener.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/Match.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/Organization.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/OtherLogListener.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/TennisMatch.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/annotations/reflection/XMLContextTest.java (88%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/ast/ASTIteratorTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/ast/ASTUtilTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/bytecode/Bean.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/bytecode/Bean.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/bytecode/BeanReflectionHelper.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/bytecode/ProxyBean.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/Cacheable.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/CacheableFileTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/orm-serializable.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/Gate.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/GoofyException.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/Palmtree.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/Portal.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/Tree.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/cfg/persister/Window.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java (97%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/function/Product.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/function/Product.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/unit/lockhint/SQLServerLockHintsTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/unit/lockhint/SybaseASE15LockHintsTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/dialect/unit/lockhint/SybaseLockHintsTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/Customer.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/Customer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/Employee.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/Employee.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/ExtendsTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/Person.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/Person.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/allinone.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/entitynames.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/A.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ABC.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ABCExtends.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ABCProxy.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Abstract.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/AbstractProxy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/AltSimple.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Assignable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/B.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Bar.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/BarProxy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/BasicNameable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Baz.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Baz.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Blobber.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Blobber.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Broken.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Broken.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/C1.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/C2.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Category.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Category.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Child.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Circular.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Circular.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Commento.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Company.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Component.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ComponentCollection.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ComponentNotNull.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ComponentNotNullMaster.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Componentizable.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Componentizable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/CompositeElement.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/CompositeIdId.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Contained.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Container.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Container.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Custom.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Custom.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/CustomPersister.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/CustomSQL.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/D.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Detail.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/DoubleStringType.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Down.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Drug.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/E.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Eye.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Eye.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fee.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fee.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fixed.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fo.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fo.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Foo.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/FooBar.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/FooComponent.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/FooProxy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fum.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fum.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/FumCompositeID.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fumm.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Fumm.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Glarch.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Glarch.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/GlarchProxy.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Holder.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Holder.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/I.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/IJ.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/IJ2.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Immutable.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Immutable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Inner.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/InnerKey.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Intervention.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/J.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Jay.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/K.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Location.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Location.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Lower.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MainObject.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MainObject.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Many.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Many.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Map.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Marelo.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Master.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MasterDetail.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Medication.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Middle.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Middle.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MiddleKey.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Mono.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MoreStuff.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Multi.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Multi.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MultiExtends.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Multiplicity.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/MultiplicityType.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Nameable.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Nameable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Named.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/NestingComponent.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Object2.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Object2.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/One.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/One.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Outer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/OuterKey.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Parent.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ParentChild.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Part.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Party.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Person.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Po.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Qux.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Qux.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Resource.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Result.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/ReverseComparator.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Role.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/S.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Several.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Simple.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Simple.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Single.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Sortable.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/StringComparator.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Stuff.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Stuff.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/SubComponent.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/SubDetail.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/SubMulti.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Super.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Top.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Trivial.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/TrivialClass.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Up.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/UpDown.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Vetoer.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Vetoer.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/W.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/WZ.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Wicked.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/X.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/XY.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Y.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/legacy/Z.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mapping/ValueVisitorTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mappingexception/InvalidMapping.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mappingexception/MappingExceptionTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mappingexception/User.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/mappingexception/User.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/MigrationTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/SchemaExportManagedConnectionTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/SchemaExportTest.java (92%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/Version.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/schemaupdate/mapping.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/JoinedIterableTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/PropertiesHelperTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/dtd/Child.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/dtd/EntityResolverTest.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/dtd/Parent.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/dtd/Parent.java (100%) rename hibernate-core/src/{matrix => test}/java/org/hibernate/test/util/dtd/child.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/Boat.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/Ferry.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Boy.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Cook.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Crew.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Tourist.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/configuration/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/hibernate.cfg.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/onetomany/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/onetoone/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/query/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/reflection/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml (100%) rename hibernate-core/src/{matrix => test}/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml (100%) diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java index dcecb7f9ca..606deeb2f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Map; import java.util.Properties; import org.hibernate.HibernateException; +import org.hibernate.cfg.AvailableSettings; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.cfg.Environment; import org.hibernate.internal.util.ReflectHelper; @@ -87,8 +88,8 @@ public class DriverManagerConnectionProviderImpl implements ConnectionProvider, public void configure(Map configurationValues) { LOG.usingHibernateBuiltInConnectionPool(); - String driverClassName = (String) configurationValues.get( Environment.DRIVER ); - if (driverClassName == null) LOG.jdbcDriverNotSpecified(Environment.DRIVER); + String driverClassName = (String) configurationValues.get( AvailableSettings.DRIVER ); + if (driverClassName == null) LOG.jdbcDriverNotSpecified(AvailableSettings.DRIVER); else { try { // trying via forName() first to be as close to DriverManager's semantics @@ -104,18 +105,18 @@ public class DriverManagerConnectionProviderImpl implements ConnectionProvider, } } - poolSize = ConfigurationHelper.getInt( Environment.POOL_SIZE, configurationValues, 20 ); // default pool size 20 + poolSize = ConfigurationHelper.getInt( AvailableSettings.POOL_SIZE, configurationValues, 20 ); // default pool size 20 LOG.hibernateConnectionPoolSize(poolSize); - autocommit = ConfigurationHelper.getBoolean( Environment.AUTOCOMMIT, configurationValues ); + autocommit = ConfigurationHelper.getBoolean( AvailableSettings.AUTOCOMMIT, configurationValues ); LOG.autoCommitMode( autocommit ); - isolation = ConfigurationHelper.getInteger( Environment.ISOLATION, configurationValues ); + isolation = ConfigurationHelper.getInteger( AvailableSettings.ISOLATION, configurationValues ); if (isolation != null) LOG.jdbcIsolationLevel(Environment.isolationLevelToString(isolation.intValue())); - url = (String) configurationValues.get( Environment.URL ); + url = (String) configurationValues.get( AvailableSettings.URL ); if ( url == null ) { - String msg = LOG.jdbcUrlNotSpecified(Environment.URL); + String msg = LOG.jdbcUrlNotSpecified(AvailableSettings.URL); LOG.error(msg); throw new HibernateException( msg ); } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java index a8e3a237ad..3718561d42 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java @@ -113,7 +113,7 @@ public class SchemaExport { this.sqlExceptionHelper = serviceRegistry.getService( JdbcServices.class ).getSqlExceptionHelper(); this.importFiles = ConfigurationHelper.getString( - Environment.HBM2DDL_IMPORT_FILES, + AvailableSettings.HBM2DDL_IMPORT_FILES, configuration.getProperties(), DEFAULT_IMPORT_FILE ); @@ -178,7 +178,7 @@ public class SchemaExport { this.sqlExceptionHelper = new SqlExceptionHelper(); this.importFiles = ConfigurationHelper.getString( - Environment.HBM2DDL_IMPORT_FILES, + AvailableSettings.HBM2DDL_IMPORT_FILES, properties, DEFAULT_IMPORT_FILE ); @@ -202,7 +202,7 @@ public class SchemaExport { this.sqlExceptionHelper = new SqlExceptionHelper(); this.importFiles = ConfigurationHelper.getString( - Environment.HBM2DDL_IMPORT_FILES, + AvailableSettings.HBM2DDL_IMPORT_FILES, configuration.getProperties(), DEFAULT_IMPORT_FILE ); @@ -573,7 +573,7 @@ public class SchemaExport { } if (importFile != null) { - cfg.setProperty( Environment.HBM2DDL_IMPORT_FILES, importFile ); + cfg.setProperty( AvailableSettings.HBM2DDL_IMPORT_FILES, importFile ); } StandardServiceRegistryImpl serviceRegistry = createServiceRegistry( cfg.getProperties() ); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/AccessTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/AccessTest.java index 3cb16600cb..7e235a083a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/AccessTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/AccessTest.java @@ -75,7 +75,7 @@ public class AccessTest extends BaseCoreFunctionalTestCase { tx.commit(); s.close(); } - + @Test public void testPropertyOverriding() throws Exception { Furniture fur = new Furniture(); fur.weight = 3; @@ -91,7 +91,7 @@ public class AccessTest extends BaseCoreFunctionalTestCase { tx.commit(); s.close(); } - + @Test public void testNonOverridenSubclass() throws Exception { Chair chair = new Chair(); chair.setPillow( "Blue" ); @@ -107,7 +107,7 @@ public class AccessTest extends BaseCoreFunctionalTestCase { tx.commit(); s.close(); } - + @Test public void testOverridenSubclass() throws Exception { BigBed bed = new BigBed(); bed.size = 5; @@ -125,7 +125,7 @@ public class AccessTest extends BaseCoreFunctionalTestCase { tx.commit(); s.close(); } - + @Test public void testFieldsOverriding() throws Exception { Gardenshed gs = new Gardenshed(); gs.floors = 4; @@ -142,7 +142,7 @@ public class AccessTest extends BaseCoreFunctionalTestCase { tx.commit(); s.close(); } - + @Override protected Class[] getAnnotatedClasses() { return new Class[] { Bed.class, diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java deleted file mode 100644 index f52718b868..0000000000 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008-2011, 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.test.annotations.access.jpa; - -import org.hibernate.MappingException; -import org.hibernate.cfg.AnnotationConfiguration; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.property.BasicPropertyAccessor; -import org.hibernate.property.DirectPropertyAccessor; -import org.hibernate.service.ServiceRegistry; -import org.hibernate.tuple.entity.EntityTuplizer; - -import junit.framework.TestCase; - -import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; - - -/** - * Tests verifying the correct behaviour for the usage of {@code @javax.persistence.Access}. - * - * @author Hardy Ferentschik - */ -@SuppressWarnings( {"deprecation"}) -public class AccessMappingTest extends TestCase { - private ServiceRegistry serviceRegistry; - - @Override - protected void setUp() { - serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); - } - - @Override - protected void tearDown() { - if ( serviceRegistry != null ) { - ServiceRegistryBuilder.destroy( serviceRegistry ); - } - } - - public void testInconsistentAnnotationPlacement() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - cfg.addAnnotatedClass( Course1.class ); - cfg.addAnnotatedClass( Student.class ); - try { - cfg.buildSessionFactory( serviceRegistry ); - fail( "@Id and @OneToMany are not placed consistently in test entities. SessionFactory creation should fail." ); - } - catch ( MappingException e ) { - // success - } - } - - public void testFieldAnnotationPlacement() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - Class classUnderTest = Course6.class; - cfg.addAnnotatedClass( classUnderTest ); - cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Field access should be used.", - tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter - ); - } - - public void testPropertyAnnotationPlacement() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - Class classUnderTest = Course7.class; - cfg.addAnnotatedClass( classUnderTest ); - cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Property access should be used.", - tuplizer.getIdentifierGetter() instanceof BasicPropertyAccessor.BasicGetter - ); - } - - public void testExplicitPropertyAccessAnnotationsOnProperty() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - Class classUnderTest = Course2.class; - cfg.addAnnotatedClass( classUnderTest ); - cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Property access should be used.", - tuplizer.getIdentifierGetter() instanceof BasicPropertyAccessor.BasicGetter - ); - } - - public void testExplicitPropertyAccessAnnotationsOnField() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - cfg.addAnnotatedClass( Course4.class ); - cfg.addAnnotatedClass( Student.class ); - try { - cfg.buildSessionFactory( serviceRegistry ); - fail( "@Id and @OneToMany are not placed consistently in test entities. SessionFactory creation should fail." ); - } - catch ( MappingException e ) { - // success - } - } - - public void testExplicitPropertyAccessAnnotationsWithHibernateStyleOverride() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - Class classUnderTest = Course3.class; - cfg.addAnnotatedClass( classUnderTest ); - cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Field access should be used.", - tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter - ); - - assertTrue( - "Property access should be used.", - tuplizer.getGetter( 0 ) instanceof BasicPropertyAccessor.BasicGetter - ); - } - - public void testExplicitPropertyAccessAnnotationsWithJpaStyleOverride() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - Class classUnderTest = Course5.class; - cfg.addAnnotatedClass( classUnderTest ); - cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Field access should be used.", - tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter - ); - - assertTrue( - "Property access should be used.", - tuplizer.getGetter( 0 ) instanceof BasicPropertyAccessor.BasicGetter - ); - } - - public void testDefaultFieldAccessIsInherited() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - Class classUnderTest = User.class; - cfg.addAnnotatedClass( classUnderTest ); - cfg.addAnnotatedClass( Person.class ); - cfg.addAnnotatedClass( Being.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Field access should be used since the default access mode gets inherited", - tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter - ); - } - - public void testDefaultPropertyAccessIsInherited() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - cfg.addAnnotatedClass( Horse.class ); - cfg.addAnnotatedClass( Animal.class ); - - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); - EntityTuplizer tuplizer = factory.getEntityPersister( Animal.class.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Property access should be used since explicity configured via @Access", - tuplizer.getIdentifierGetter() instanceof BasicPropertyAccessor.BasicGetter - ); - - tuplizer = factory.getEntityPersister( Horse.class.getName() ) - .getEntityMetamodel() - .getTuplizer(); - assertTrue( - "Field access should be used since the default access mode gets inherited", - tuplizer.getGetter( 0 ) instanceof DirectPropertyAccessor.DirectGetter - ); - } - - @TestForIssue( jiraKey = "HHH-5004") - public void testAccessOnClassAndId() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - cfg.addAnnotatedClass( Course8.class ); - cfg.addAnnotatedClass( Student.class ); - cfg.buildSessionFactory( serviceRegistry ); - } -} \ No newline at end of file diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java index 906b16d69a..74448980e7 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java @@ -54,11 +54,6 @@ public class ProxyBreakingTest extends BaseCoreFunctionalTestCase { s.close(); } - @Override - protected Class[] getAnnotatedClasses() { - return new Class[0]; - } - @Override protected String[] getXmlFiles() { return new String[] { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HqlParserTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/HqlParserTest.java index b73489091b..8c0b954248 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/HqlParserTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/HqlParserTest.java @@ -4,9 +4,6 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.Stack; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; import org.hibernate.hql.internal.antlr.HqlTokenTypes; import org.hibernate.hql.internal.ast.HqlParser; @@ -16,30 +13,26 @@ import org.hibernate.hql.internal.ast.util.ASTPrinter; import antlr.RecognitionException; import antlr.TokenStreamException; import antlr.collections.AST; +import org.junit.Test; +import static org.junit.Assert.*; /** * Tests the HQL parser on various inputs, just makes sure that the first phase of the parser * works properly (i.e. no unexpected syntax errors). + * todo this should be a unit test. */ -public class HqlParserTest extends TestCase { +public class HqlParserTest{ - /** - * Standard JUnit test case constructor. - * - * @param name The name of the test case. - */ - public HqlParserTest(String name) { - super( name ); - } - - public void testUnion() throws Exception { + + @Test + public void testUnion() throws Exception { parse("from Animal a where a in (from Cat union from Dog) "); } /** * Section 9.2 - from * */ - public void testDocoExamples92() throws Exception { + @Test public void testDocoExamples92() throws Exception { parse( "from eg.Cat" ); parse( "from eg.Cat as cat" ); parse( "from eg.Cat cat" ); @@ -50,7 +43,7 @@ public class HqlParserTest extends TestCase { /** * Section 9.3 - Associations and joins * */ - public void testDocoExamples93() throws Exception { + @Test public void testDocoExamples93() throws Exception { parse( "from eg.Cat as cat inner join cat.mate as mate left outer join cat.kittens as kitten" ); parse( "from eg.Cat as cat left join cat.mate.kittens as kittens" ); parse( "from Formula form full join form.parameter param" ); @@ -61,7 +54,7 @@ public class HqlParserTest extends TestCase { /** * Section 9.4 - Select * */ - public void testDocoExamples94() throws Exception { + @Test public void testDocoExamples94() throws Exception { parse( "select mate from eg.Cat as cat inner join cat.mate as mate" ); parse( "select cat.mate from eg.Cat cat" ); parse( "select elements(cat.kittens) from eg.Cat cat" ); @@ -79,7 +72,7 @@ public class HqlParserTest extends TestCase { /** * Section 9.5 - Aggregate functions * */ - public void testDocoExamples95() throws Exception { + @Test public void testDocoExamples95() throws Exception { parse( "select avg(cat.weight), sum(cat.weight), max(cat.weight), count(cat)\n" + "from eg.Cat cat" ); parse( "select cat, count( elements(cat.kittens) )\n" @@ -91,7 +84,7 @@ public class HqlParserTest extends TestCase { /** * Section 9.6 - Polymorphism * */ - public void testDocoExamples96() throws Exception { + @Test public void testDocoExamples96() throws Exception { parse( "from eg.Cat as cat" ); parse( "from java.lang.Object o" ); parse( "from eg.Named n, eg.Named m where n.name = m.name" ); @@ -100,7 +93,7 @@ public class HqlParserTest extends TestCase { /** * Section 9.7 - Where * */ - public void testDocoExamples97() throws Exception { + @Test public void testDocoExamples97() throws Exception { parse( "from eg.Cat as cat where cat.name='Fritz'" ); parse( "select foo\n" + "from eg.Foo foo, eg.Bar bar\n" @@ -126,7 +119,7 @@ public class HqlParserTest extends TestCase { /** * Section 9.8 - Expressions * */ - public void testDocoExamples98() throws Exception { + @Test public void testDocoExamples98() throws Exception { parse( "from eg.DomesticCat cat where cat.name between 'A' and 'B'" ); parse( "from eg.DomesticCat cat where cat.name in ( 'Foo', 'Bar', 'Baz' )" ); parse( "from eg.DomesticCat cat where cat.name not between 'A' and 'B'" ); @@ -182,12 +175,12 @@ public class HqlParserTest extends TestCase { } - public void testDocoExamples99() throws Exception { + @Test public void testDocoExamples99() throws Exception { parse( "from eg.DomesticCat cat\n" + "order by cat.name asc, cat.weight desc, cat.birthdate" ); } - public void testDocoExamples910() throws Exception { + @Test public void testDocoExamples910() throws Exception { parse( "select cat.color, sum(cat.weight), count(cat)\n" + "from eg.Cat cat group by cat.color" ); parse( "select foo.id, avg( elements(foo.names) ), max( indices(foo.names) )\n" @@ -200,7 +193,7 @@ public class HqlParserTest extends TestCase { + "order by count(kitten) asc, sum(kitten.weight) desc" ); } - public void testDocoExamples911() throws Exception { + @Test public void testDocoExamples911() throws Exception { parse( "from eg.Cat as fatcat where fatcat.weight > (\n" + "select avg(cat.weight) from eg.DomesticCat cat)" ); parse( "from eg.DomesticCat as cat where cat.name = some (\n" @@ -211,7 +204,7 @@ public class HqlParserTest extends TestCase { + "select name.nickName from eg.Name as name)" ); } - public void testDocoExamples912() throws Exception { + @Test public void testDocoExamples912() throws Exception { parse( "select ord.id, sum(price.amount), count(item)\n" + "from Order as ord join ord.lineItems as item\n" + "join item.product as product, Catalog as catalog\n" @@ -271,7 +264,7 @@ public class HqlParserTest extends TestCase { + "order by account.type.sortOrder, account.accountNumber, payment.dueDate" ); } - public void testExamples1() throws Exception { + @Test public void testExamples1() throws Exception { parse( "select new org.hibernate.test.S(s.count, s.address)\n" + "from s in class Simple" ); parse( "select s.name, sysdate, trunc(s.pay), round(s.pay) from s in class Simple" ); @@ -280,32 +273,32 @@ public class HqlParserTest extends TestCase { parse( "select trunc(round(sysdate)) from s in class Simple" ); } - public void testArrayExpr() throws Exception { + @Test public void testArrayExpr() throws Exception { parse( "from Order ord where ord.items[0].id = 1234" ); } - public void testMultipleActualParameters() throws Exception { + @Test public void testMultipleActualParameters() throws Exception { parse( "select round(s.pay, 2) from s" ); } - public void testMultipleFromClasses() throws Exception { + @Test public void testMultipleFromClasses() throws Exception { parse( "FROM eg.mypackage.Cat qat, com.toadstool.Foo f" ); parse( "FROM eg.mypackage.Cat qat, org.jabberwocky.Dipstick" ); } - public void testFromWithJoin() throws Exception { + @Test public void testFromWithJoin() throws Exception { parse( "FROM eg.mypackage.Cat qat, com.toadstool.Foo f join net.sf.blurb.Blurb" ); parse( "FROM eg.mypackage.Cat qat left join com.multijoin.JoinORama , com.toadstool.Foo f join net.sf.blurb.Blurb" ); } - public void testSelect() throws Exception { + @Test public void testSelect() throws Exception { parse( "SELECT f FROM eg.mypackage.Cat qat, com.toadstool.Foo f join net.sf.blurb.Blurb" ); parse( "SELECT DISTINCT bar FROM eg.mypackage.Cat qat left join com.multijoin.JoinORama as bar, com.toadstool.Foo f join net.sf.blurb.Blurb" ); parse( "SELECT count(*) FROM eg.mypackage.Cat qat" ); parse( "SELECT avg(qat.weight) FROM eg.mypackage.Cat qat" ); } - public void testWhere() throws Exception { + @Test public void testWhere() throws Exception { parse( "FROM eg.mypackage.Cat qat where qat.name like '%fluffy%' or qat.toes > 5" ); parse( "FROM eg.mypackage.Cat qat where not qat.name like '%fluffy%' or qat.toes > 5" ); parse( "FROM eg.mypackage.Cat qat where not qat.name not like '%fluffy%'" ); @@ -315,33 +308,33 @@ public class HqlParserTest extends TestCase { parse( "from Animal an where (an.bodyWeight > 10 and an.bodyWeight < 100) or an.bodyWeight is null" ); } - public void testGroupBy() throws Exception { + @Test public void testGroupBy() throws Exception { parse( "FROM eg.mypackage.Cat qat group by qat.breed" ); parse( "FROM eg.mypackage.Cat qat group by qat.breed, qat.eyecolor" ); } - public void testOrderBy() throws Exception { + @Test public void testOrderBy() throws Exception { parse( "FROM eg.mypackage.Cat qat order by avg(qat.toes)" ); parse( "from Animal an order by sqrt(an.bodyWeight)/2" ); } - public void testDoubleLiteral() throws Exception { + @Test public void testDoubleLiteral() throws Exception { parse( "from eg.Cat as tinycat where fatcat.weight < 3.1415" ); parse( "from eg.Cat as enormouscat where fatcat.weight > 3.1415e3" ); } - public void testComplexConstructor() throws Exception { + @Test public void testComplexConstructor() throws Exception { parse( "select new Foo(count(bar)) from bar" ); parse( "select new Foo(count(bar),(select count(*) from doofus d where d.gob = 'fat' )) from bar" ); } - public void testInNotIn() throws Exception { + @Test public void testInNotIn() throws Exception { parse( "from foo where foo.bar in ('a' , 'b', 'c')" ); parse( "from foo where foo.bar not in ('a' , 'b', 'c')" ); } - public void testOperatorPrecedence() throws Exception { + @Test public void testOperatorPrecedence() throws Exception { parse( "from foo where foo.bar = 123 + foo.baz * foo.not" ); parse( "from foo where foo.bar like 'testzzz' || foo.baz or foo.bar in ('duh', 'gob')" ); } @@ -351,7 +344,7 @@ public class HqlParserTest extends TestCase { * * @throws Exception if the HQL could not be parsed. */ - public void testUnitTestHql() throws Exception { + @Test public void testUnitTestHql() throws Exception { parse( "select foo from foo in class org.hibernate.test.Foo, fee in class org.hibernate.test.Fee where foo.dependent = fee order by foo.string desc, foo.component.count asc, fee.id" ); parse( "select foo.foo, foo.dependent from foo in class org.hibernate.test.Foo order by foo.foo.string desc, foo.component.count asc, foo.dependent.id" ); parse( "select foo from foo in class org.hibernate.test.Foo order by foo.dependent.id, foo.dependent.fi" ); @@ -880,26 +873,26 @@ public class HqlParserTest extends TestCase { parse( "from org.hibernate.test.Componentizable" ); } - public void testUnnamedParameter() throws Exception { + @Test public void testUnnamedParameter() throws Exception { parse( "select foo, bar from org.hibernate.test.Foo foo left outer join foo.foo bar where foo = ?" ); // Added '?' as a valid expression. } - public void testInElements() throws Exception { + @Test public void testInElements() throws Exception { parse( "from bar in class org.hibernate.test.Bar, foo in elements(bar.baz.fooArray)" ); // Added collectionExpr as a valid 'in' clause. } - public void testDotElements() throws Exception { + @Test public void testDotElements() throws Exception { parse( "select distinct foo from baz in class org.hibernate.test.Baz, foo in elements(baz.fooArray)" ); parse( "select foo from baz in class org.hibernate.test.Baz, foo in elements(baz.fooSet)" ); parse( "select foo from baz in class org.hibernate.test.Baz, foo in elements(baz.fooArray)" ); parse( "from org.hibernate.test.Baz baz where 'b' in elements(baz.collectionComponent.nested.foos) and 1.0 in elements(baz.collectionComponent.nested.floats)" ); } - public void testSelectAll() throws Exception { + @Test public void testSelectAll() throws Exception { parse( "select all s, s.other from s in class org.hibernate.test.Simple where s = :s" ); } - public void testNot() throws Exception { + @Test public void testNot() throws Exception { // Cover NOT optimization in HqlParser parse( "from eg.Cat cat where not ( cat.kittens.size < 1 )" ); parse( "from eg.Cat cat where not ( cat.kittens.size > 1 )" ); @@ -911,7 +904,7 @@ public class HqlParserTest extends TestCase { parse( "from eg.Cat cat where not not ( not cat.kittens.size <= 1 )" ); } - public void testOtherSyntax() throws Exception { + @Test public void testOtherSyntax() throws Exception { parse( "select bar from org.hibernate.test.Bar bar order by ((bar.x - :valueX)*(bar.x - :valueX))" ); parse( "from bar in class org.hibernate.test.Bar, foo in elements(bar.baz.fooSet)" ); parse( "from one in class org.hibernate.test.One, many in elements(one.manies) where one.id = 1 and many.id = 1" ); @@ -928,25 +921,25 @@ public class HqlParserTest extends TestCase { // parse("from sm in class org.hibernate.test.SubMulti where exists sm.children.elements"); } - public void testEjbqlExtensions() throws Exception { + @Test public void testEjbqlExtensions() throws Exception { parse( "select object(a) from Animal a where a.mother member of a.offspring" ); parse( "select object(a) from Animal a where a.mother member a.offspring" ); //no member of parse( "select object(a) from Animal a where a.offspring is empty" ); } - public void testEmptyFilter() throws Exception { + @Test public void testEmptyFilter() throws Exception { parseFilter( "" ); // Blank is a legitimate filter. } - public void testOrderByFilter() throws Exception { + @Test public void testOrderByFilter() throws Exception { parseFilter( "order by this.id" ); } - public void testRestrictionFilter() throws Exception { + @Test public void testRestrictionFilter() throws Exception { parseFilter( "where this.name = ?" ); } - public void testNoFrom() throws Exception { + @Test public void testNoFrom() throws Exception { System.out.println( "***** This test ensures that an error is detected ERROR MESSAGES ARE OKAY! *****" ); HqlParser parser = HqlParser.getInstance( "" ); parser.setFilter( false ); @@ -955,11 +948,11 @@ public class HqlParserTest extends TestCase { System.out.println( "***** END OF ERROR TEST *****" ); } - public void testHB1042() throws Exception { + @Test public void testHB1042() throws Exception { parse( "select x from fmc_web.pool.Pool x left join x.containers c0 where (upper(x.name) = upper(':') and c0.id = 1)" ); } - public void testKeywordInPath() throws Exception { + @Test public void testKeywordInPath() throws Exception { // The keyword 'order' used as a property name. parse( "from Customer c where c.order.status = 'argh'" ); // The keyword 'order' and 'count' used as a property name. @@ -970,7 +963,7 @@ public class HqlParserTest extends TestCase { parse( "from Letter l where l.case = :case" ); } - public void testPathologicalKeywordAsIdentifier() throws Exception { + @Test public void testPathologicalKeywordAsIdentifier() throws Exception { // Super evil badness... a legitimate keyword! parse( "from Order order" ); //parse( "from Order order join order.group" ); @@ -984,45 +977,45 @@ public class HqlParserTest extends TestCase { parse( "from Group as group group by group.by.from" ); } - public void testHHH354() throws Exception { + @Test public void testHHH354() throws Exception { parse( "from Foo f where f.full = 'yep'"); } - public void testWhereAsIdentifier() throws Exception { + @Test public void testWhereAsIdentifier() throws Exception { // 'where' as a package name parse( "from where.Order" ); } - public void testEjbqlKeywordsAsIdentifier() throws Exception { + @Test public void testEjbqlKeywordsAsIdentifier() throws Exception { parse( "from org.hibernate.test.Bar bar where bar.object.id = ? and bar.object.class = ?" ); } - public void testConstructorIn() throws Exception { + @Test public void testConstructorIn() throws Exception { parse( "from org.hibernate.test.Bar bar where (b.x, b.y, b.z) in (select foo, bar, baz from org.hibernate.test.Foo)" ); } - public void testMultiByteCharacters() throws Exception { + @Test public void testMultiByteCharacters() throws Exception { parse ("from User user where user.name like '%nn\u4e2dnn%'"); // Test for HHH-558 parse ("from User user where user.\u432d like '%\u4e2d%'"); parse ("from \u432d \u432d where \u432d.name like '%fred%'"); } - public void testHHH719() throws Exception { + @Test public void testHHH719() throws Exception { // Some SQLs have function names with package qualifiers. parse("from Foo f order by com.fooco.SpecialFunction(f.id)"); } - public void testHHH1107() throws Exception { + @Test public void testHHH1107() throws Exception { parse("from Animal where zoo.address.street = '123 Bogus St.'"); } - public void testHHH1247() throws Exception { + @Test public void testHHH1247() throws Exception { parse("select distinct user.party from com.itf.iceclaims.domain.party.user.UserImpl user inner join user.party.$RelatedWorkgroups relatedWorkgroups where relatedWorkgroups.workgroup.id = :workgroup and relatedWorkgroups.effectiveTime.start <= :datesnow and relatedWorkgroups.effectiveTime.end > :dateenow "); } - public void testHHH1780() throws Exception { + @Test public void testHHH1780() throws Exception { // verifies the tree contains a NOT->EXISTS subtree class Verifier { public boolean verify(AST root) { @@ -1062,7 +1055,7 @@ public class HqlParserTest extends TestCase { } - public void testLineAndColumnNumber() throws Exception { + @Test public void testLineAndColumnNumber() throws Exception { AST ast = doParse("from Foo f\nwhere f.name = 'fred'",false); // Find some of the nodes and check line and column values. ASTIterator iter = new ASTIterator(ast); @@ -1116,7 +1109,5 @@ public class HqlParserTest extends TestCase { return ast; } - public static Test suite() { - return new TestSuite( HqlParserTest.class ); - } + } diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/AbstractExecutable.java b/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/AbstractExecutable.java index 7665886fa3..0c3d0f7e35 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/AbstractExecutable.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/instrument/cases/AbstractExecutable.java @@ -13,7 +13,7 @@ public abstract class AbstractExecutable implements Executable { private ServiceRegistry serviceRegistry; private SessionFactory factory; - + @Override public final void prepare() { Configuration cfg = new Configuration().setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); String[] resources = getResources(); @@ -23,7 +23,7 @@ public abstract class AbstractExecutable implements Executable { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); factory = cfg.buildSessionFactory( serviceRegistry ); } - + @Override public final void complete() { try { cleanup(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java index fd7b34b2e3..317d3f7c0a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/LegacyTestCase.java @@ -48,7 +48,7 @@ public abstract class LegacyTestCase extends BaseCoreFunctionalTestCase { @Before @SuppressWarnings( {"UnnecessaryUnboxing"}) public void checkAntlrParserSetting() { - useAntlrParser = Boolean.valueOf( extractFromSystem( USE_ANTLR_PARSER_PROP ) ).booleanValue(); + useAntlrParser = Boolean.valueOf( extractFromSystem( USE_ANTLR_PARSER_PROP ) ); } protected static String extractFromSystem(String systemPropertyName) { diff --git a/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java index 4d038c95d5..0f4cfa4bb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java @@ -38,6 +38,7 @@ import org.hibernate.cfg.ObjectNameNormalizer; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.internal.SessionImpl; import org.hibernate.jdbc.Work; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; @@ -67,6 +68,7 @@ public class SequenceHiLoGeneratorNoIncrementTest extends BaseUnitTestCase { private ServiceRegistry serviceRegistry; private SessionFactoryImplementor sessionFactory; private SequenceHiLoGenerator generator; + private SessionImplementor session; @Before public void setUp() throws Exception { @@ -108,6 +110,9 @@ public class SequenceHiLoGeneratorNoIncrementTest extends BaseUnitTestCase { @After public void tearDown() throws Exception { + if(session != null && !session.isClosed()) { + ((Session)session).close(); + } if ( sessionFactory != null ) { sessionFactory.close(); } @@ -118,12 +123,12 @@ public class SequenceHiLoGeneratorNoIncrementTest extends BaseUnitTestCase { @Test public void testHiLoAlgorithm() { - SessionImpl session = (SessionImpl) sessionFactory.openSession(); - session.beginTransaction(); + session = (SessionImpl) sessionFactory.openSession(); + ((Session)session).beginTransaction(); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // initially sequence should be uninitialized - assertEquals( 0L, extractSequenceValue( session ) ); + assertEquals( 0L, extractSequenceValue( ((Session)session) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // historically the hilo generators skipped the initial block of values; @@ -131,30 +136,30 @@ public class SequenceHiLoGeneratorNoIncrementTest extends BaseUnitTestCase { Long generatedValue = (Long) generator.generate( session, null ); assertEquals( 1L, generatedValue.longValue() ); // which should also perform the first read on the sequence which should set it to its "start with" value (1) - assertEquals( 1L, extractSequenceValue( session ) ); + assertEquals( 1L, extractSequenceValue( ((Session)session) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ generatedValue = (Long) generator.generate( session, null ); assertEquals( 2L, generatedValue.longValue() ); - assertEquals( 2L, extractSequenceValue( session ) ); + assertEquals( 2L, extractSequenceValue( ((Session)session) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ generatedValue = (Long) generator.generate( session, null ); assertEquals( 3L, generatedValue.longValue() ); - assertEquals( 3L, extractSequenceValue( session ) ); + assertEquals( 3L, extractSequenceValue( ((Session)session) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ generatedValue = (Long) generator.generate( session, null ); assertEquals( 4L, generatedValue.longValue() ); - assertEquals( 4L, extractSequenceValue( session ) ); + assertEquals( 4L, extractSequenceValue( ((Session)session) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ generatedValue = (Long) generator.generate( session, null ); assertEquals( 5L, generatedValue.longValue() ); - assertEquals( 5L, extractSequenceValue( session ) ); + assertEquals( 5L, extractSequenceValue( ((Session)session) ) ); - session.getTransaction().commit(); - session.close(); + ((Session)session).getTransaction().commit(); + ((Session)session).close(); } private long extractSequenceValue(Session session) { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/A320.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/A320.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/A320.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/A320.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/A320b.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/A320b.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/A320b.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/A320b.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/AlternativeNamingStrategy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/AmericaCupClass.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/AmericaCupClass.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/AmericaCupClass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Boat.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Boat.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Boat.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Boat.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Company.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java similarity index 86% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/ConfigurationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java index a49fdaa4a2..c8e3747991 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/ConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java @@ -1,11 +1,16 @@ //$Id$ package org.hibernate.test.annotations; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; -import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; @@ -14,21 +19,21 @@ import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard */ -public class ConfigurationTest extends junit.framework.TestCase { +public class ConfigurationTest { private ServiceRegistry serviceRegistry; - - protected void setUp() { + @Before + public void setUp() { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - - protected void tearDown() { + @After + public void tearDown() { if ( serviceRegistry != null ) { ServiceRegistryBuilder.destroy( serviceRegistry ); } } - + @Test public void testDeclarativeMix() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); @@ -43,12 +48,12 @@ public class ConfigurationTest extends junit.framework.TestCase { s.close(); sf.close(); } - + @Test public void testIgnoringHbm() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - cfg.setProperty( AnnotationConfiguration.ARTEFACT_PROCESSING_ORDER, "class" ); + cfg.setProperty( Configuration.ARTEFACT_PROCESSING_ORDER, "class" ); SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); @@ -67,9 +72,9 @@ public class ConfigurationTest extends junit.framework.TestCase { s.close(); sf.close(); } - + @Test public void testPrecedenceHbm() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); cfg.addAnnotatedClass( Boat.class ); @@ -92,12 +97,12 @@ public class ConfigurationTest extends junit.framework.TestCase { s.close(); sf.close(); } - + @Test public void testPrecedenceAnnotation() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - cfg.setProperty( AnnotationConfiguration.ARTEFACT_PROCESSING_ORDER, "class, hbm" ); + cfg.setProperty( Configuration.ARTEFACT_PROCESSING_ORDER, "class, hbm" ); cfg.addAnnotatedClass( Boat.class ); SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); @@ -117,9 +122,9 @@ public class ConfigurationTest extends junit.framework.TestCase { s.close(); sf.close(); } - + @Test public void testHbmWithSubclassExtends() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.addClass( Ferry.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); @@ -135,9 +140,9 @@ public class ConfigurationTest extends junit.framework.TestCase { s.close(); sf.close(); } - + @Test public void testAnnReferencesHbm() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.addAnnotatedClass( Port.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Discount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Discount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Discount.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Discount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Ferry.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Ferry.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Ferry.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Ferry.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Flight.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Flight.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Flight.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Flight.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/FlyingObject.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/FlyingObject.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/FlyingObject.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/FlyingObject.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/IncorrectEntity.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/IncorrectEntity.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/IncorrectEntity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Passport.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Passport.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Passport.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Passport.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Plane.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Plane.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Plane.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Plane.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Port.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Port.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Port.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Port.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/SafeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java similarity index 82% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/SafeMappingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java index db1d0c8b68..2c4935892e 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/SafeMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java @@ -1,7 +1,9 @@ //$Id$ package org.hibernate.test.annotations; +import org.junit.Test; +import static org.junit.Assert.*; import org.hibernate.AnnotationException; -import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; @@ -9,9 +11,10 @@ import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard */ -public class SafeMappingTest extends junit.framework.TestCase { +public class SafeMappingTest { + @Test public void testDeclarativeMix() throws Exception { - AnnotationConfiguration cfg = new AnnotationConfiguration(); + Configuration cfg = new Configuration(); cfg.addAnnotatedClass( IncorrectEntity.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); ServiceRegistry serviceRegistry = null; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/SecuredBindingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java similarity index 82% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/SecuredBindingTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java index af454c2c00..4cef123803 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/SecuredBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java @@ -3,9 +3,12 @@ package org.hibernate.test.annotations; import java.util.Properties; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.HibernateException; import org.hibernate.SessionFactory; -import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; @@ -14,14 +17,12 @@ import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard */ -public class SecuredBindingTest extends TestCase { +public class SecuredBindingTest { - public SecuredBindingTest(String x) { - super( x ); - } + @Test public void testConfigurationMethods() throws Exception { - AnnotationConfiguration ac = new AnnotationConfiguration(); + Configuration ac = new Configuration(); Properties p = new Properties(); p.put( Environment.DIALECT, "org.hibernate.dialect.HSQLDialect" ); p.put( "hibernate.connection.driver_class", "org.hsqldb.jdbcDrive" ); @@ -41,7 +42,7 @@ public class SecuredBindingTest extends TestCase { } catch (Exception ignore) { } - fail( "Driver property overriding should work" ); + Assert.fail( "Driver property overriding should work" ); } catch (HibernateException he) { //success diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Sky.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Sky.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Sky.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Sky.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Thing.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Thing.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Thing.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Thing.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/Ticket.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/Ticket.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/Ticket.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/Ticket.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/TicketComparator.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/TicketComparator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/TicketComparator.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/TicketComparator.java diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java new file mode 100644 index 0000000000..2d76123644 --- /dev/null +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java @@ -0,0 +1,233 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008-2011, 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.test.annotations.access.jpa; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import org.hibernate.MappingException; +import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Environment; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.property.BasicPropertyAccessor; +import org.hibernate.property.DirectPropertyAccessor; +import org.hibernate.service.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; +import org.hibernate.testing.TestForIssue; +import org.hibernate.tuple.entity.EntityTuplizer; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + + +/** + * Tests verifying the correct behaviour for the usage of {@code @javax.persistence.Access}. + * + * @author Hardy Ferentschik + */ +@SuppressWarnings({ "deprecation" }) +public class AccessMappingTest { + private ServiceRegistry serviceRegistry; + + @Before + public void setUp() { + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); + } + + @After + public void tearDown() { + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + } + } + + @Test + public void testInconsistentAnnotationPlacement() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + cfg.addAnnotatedClass( Course1.class ); + cfg.addAnnotatedClass( Student.class ); + try { + cfg.buildSessionFactory( serviceRegistry ); + fail( "@Id and @OneToMany are not placed consistently in test entities. SessionFactory creation should fail." ); + } + catch ( MappingException e ) { + // success + } + } + + @Test + public void testFieldAnnotationPlacement() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + Class classUnderTest = Course6.class; + cfg.addAnnotatedClass( classUnderTest ); + cfg.addAnnotatedClass( Student.class ); + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Field access should be used.", + tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter + ); + } + + @Test + public void testPropertyAnnotationPlacement() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + Class classUnderTest = Course7.class; + cfg.addAnnotatedClass( classUnderTest ); + cfg.addAnnotatedClass( Student.class ); + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Property access should be used.", + tuplizer.getIdentifierGetter() instanceof BasicPropertyAccessor.BasicGetter + ); + } + + @Test + public void testExplicitPropertyAccessAnnotationsOnProperty() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + Class classUnderTest = Course2.class; + cfg.addAnnotatedClass( classUnderTest ); + cfg.addAnnotatedClass( Student.class ); + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Property access should be used.", + tuplizer.getIdentifierGetter() instanceof BasicPropertyAccessor.BasicGetter + ); + } + + @Test + public void testExplicitPropertyAccessAnnotationsOnField() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + cfg.addAnnotatedClass( Course4.class ); + cfg.addAnnotatedClass( Student.class ); + try { + cfg.buildSessionFactory( serviceRegistry ); + fail( "@Id and @OneToMany are not placed consistently in test entities. SessionFactory creation should fail." ); + } + catch ( MappingException e ) { + // success + } + } + + @Test + public void testExplicitPropertyAccessAnnotationsWithHibernateStyleOverride() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + Class classUnderTest = Course3.class; + cfg.addAnnotatedClass( classUnderTest ); + cfg.addAnnotatedClass( Student.class ); + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Field access should be used.", + tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter + ); + + assertTrue( + "Property access should be used.", + tuplizer.getGetter( 0 ) instanceof BasicPropertyAccessor.BasicGetter + ); + } + + @Test + public void testExplicitPropertyAccessAnnotationsWithJpaStyleOverride() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + Class classUnderTest = Course5.class; + cfg.addAnnotatedClass( classUnderTest ); + cfg.addAnnotatedClass( Student.class ); + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Field access should be used.", + tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter + ); + + assertTrue( + "Property access should be used.", + tuplizer.getGetter( 0 ) instanceof BasicPropertyAccessor.BasicGetter + ); + } + + @Test + public void testDefaultFieldAccessIsInherited() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + Class classUnderTest = User.class; + cfg.addAnnotatedClass( classUnderTest ); + cfg.addAnnotatedClass( Person.class ); + cfg.addAnnotatedClass( Being.class ); + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( classUnderTest.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Field access should be used since the default access mode gets inherited", + tuplizer.getIdentifierGetter() instanceof DirectPropertyAccessor.DirectGetter + ); + } + + @Test + public void testDefaultPropertyAccessIsInherited() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + cfg.addAnnotatedClass( Horse.class ); + cfg.addAnnotatedClass( Animal.class ); + + SessionFactoryImplementor factory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); + EntityTuplizer tuplizer = factory.getEntityPersister( Animal.class.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Property access should be used since explicity configured via @Access", + tuplizer.getIdentifierGetter() instanceof BasicPropertyAccessor.BasicGetter + ); + + tuplizer = factory.getEntityPersister( Horse.class.getName() ) + .getEntityMetamodel() + .getTuplizer(); + assertTrue( + "Field access should be used since the default access mode gets inherited", + tuplizer.getGetter( 0 ) instanceof DirectPropertyAccessor.DirectGetter + ); + } + + @TestForIssue(jiraKey = "HHH-5004") + @Test + public void testAccessOnClassAndId() throws Exception { + AnnotationConfiguration cfg = new AnnotationConfiguration(); + cfg.addAnnotatedClass( Course8.class ); + cfg.addAnnotatedClass( Student.class ); + cfg.buildSessionFactory( serviceRegistry ); + } +} \ No newline at end of file diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Animal.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Animal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Animal.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Animal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Bed.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Bed.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Being.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Being.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/BigBed.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/BigBed.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Chair.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Chair.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Circle.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Circle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Circle.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Circle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Color.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Color.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Color.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Color.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course1.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course1.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course1.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course1.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course3.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course3.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course3.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course3.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course4.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course4.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course4.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course4.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course5.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course5.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course5.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course5.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course6.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course6.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course6.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course6.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course7.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course7.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course7.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course7.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course8.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course8.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Course8.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Course8.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Furniture.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Furniture.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Furniture.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Furniture.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Horse.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Horse.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Horse.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Horse.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Position.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Position.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Position.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Position.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Shape.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Shape.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Shape.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Shape.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Square.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Square.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Square.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Square.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Student.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Student.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Student.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Student.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Thingy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Thingy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/User.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/User.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Woody.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/jpa/Woody.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Boy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Boy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Boy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Boy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Cook.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Cook.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Cook.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Cook.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Crew.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Crew.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Driver.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Driver.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Knive.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Knive.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Knive.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Knive.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/RentalCar.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/RentalCar.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Tourist.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Tourist.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Waiter.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/Waiter.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java similarity index 90% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java index 3c4e4fd0a6..c95d7d2916 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java @@ -7,6 +7,7 @@ import java.io.StringWriter; import org.jboss.logging.Logger; import org.hibernate.MappingException; +import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.service.ServiceRegistry; @@ -32,6 +33,7 @@ public class BackquoteTest extends BaseUnitTestCase { private static final Logger log = Logger.getLogger( BackquoteTest.class ); private ServiceRegistry serviceRegistry; + private SessionFactory sessionFactory; @Before public void setUp() { @@ -40,6 +42,7 @@ public class BackquoteTest extends BaseUnitTestCase { @After public void tearDown() { + if(sessionFactory !=null) sessionFactory.close(); if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } @@ -50,7 +53,7 @@ public class BackquoteTest extends BaseUnitTestCase { Configuration config = new Configuration(); config.addAnnotatedClass(Bug.class); config.addAnnotatedClass(Category.class); - config.buildSessionFactory( serviceRegistry ); + sessionFactory = config.buildSessionFactory( serviceRegistry ); } catch( Exception e ) { StringWriter writer = new StringWriter(); @@ -74,7 +77,7 @@ public class BackquoteTest extends BaseUnitTestCase { Configuration config = new Configuration(); config.addAnnotatedClass(Printer.class); config.addAnnotatedClass(PrinterCable.class); - config.buildSessionFactory( serviceRegistry ); + sessionFactory = config.buildSessionFactory( serviceRegistry ); fail("expected MappingException to be thrown"); } //we WANT MappingException to be thrown diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/Bug.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/Bug.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/Bug.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/Bug.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/Category.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/Category.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/Category.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/Category.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/Printer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/Printer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/Printer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/Printer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/PrinterCable.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/PrinterCable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/backquotes/PrinterCable.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/PrinterCable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java similarity index 73% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java index d666ff8794..a5f4a7dd78 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/ConfigurationTest.java @@ -2,12 +2,16 @@ package org.hibernate.test.annotations.configuration; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.cfg.AnnotationConfiguration; /** * @author Emmanuel Bernard */ -public class ConfigurationTest extends TestCase { +public class ConfigurationTest { + @Test public void testMixPackageAndResourceOrdering() throws Exception { try { AnnotationConfiguration config = new AnnotationConfiguration(); @@ -15,7 +19,7 @@ public class ConfigurationTest extends TestCase { config.addPackage( "org.hibernate.test.annotations.configuration" ); } catch( Exception e ) { - fail("Processing package first when ORM.xml is used should not fail"); + Assert.fail( "Processing package first when ORM.xml is used should not fail" ); } } } diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/configuration/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/configuration/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/configuration/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java similarity index 87% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java index d3a7e515a0..423c1d45b3 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java @@ -1,6 +1,8 @@ //$Id$ package org.hibernate.test.annotations.duplicatedgenerator; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import org.hibernate.AnnotationException; import org.hibernate.cfg.AnnotationConfiguration; @@ -12,7 +14,8 @@ import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard */ -public class DuplicateTest extends TestCase { +public class DuplicateTest { + @Test public void testDuplicateEntityName() throws Exception { AnnotationConfiguration cfg = new AnnotationConfiguration(); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); @@ -24,7 +27,7 @@ public class DuplicateTest extends TestCase { cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml" ); serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); cfg.buildSessionFactory( serviceRegistry ); - fail( "Should not be able to map the same entity name twice" ); + Assert.fail( "Should not be able to map the same entity name twice" ); } catch (AnnotationException ae) { //success diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/Flight.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Country.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Country.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Country.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer2.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer2.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer3.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer3.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer4.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer4.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer5.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Customer5.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/MoreFetchProfileTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Order.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/Order.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fetchprofile/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/A_PK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/A_PK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/B.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/C.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassA.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassA.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassB.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassB.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassC.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassC.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassD.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/ClassD.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/D.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/D.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/D_PK.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/D_PK.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java similarity index 81% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java index 9f2f46af06..d5a0002c23 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java @@ -6,39 +6,42 @@ import java.io.StringWriter; import org.jboss.logging.Logger; -import junit.framework.TestCase; -import org.hibernate.cfg.AnnotationConfiguration; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.SQLServerDialect; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; /** * Test case for ANN-722 and ANN-730. * * @author Hardy Ferentschik */ -public class FkCircularityTest extends TestCase { +public class FkCircularityTest { private static final Logger log = Logger.getLogger( FkCircularityTest.class ); private ServiceRegistry serviceRegistry; - @Override - protected void setUp() { + @Before + public void setUp() { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - @Override - protected void tearDown() { + @After + public void tearDown() { if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } - + @Test public void testJoinedSublcassesInPK() { try { - AnnotationConfiguration config = new AnnotationConfiguration(); + Configuration config = new Configuration(); config.addAnnotatedClass(A.class); config.addAnnotatedClass(B.class); config.addAnnotatedClass(C.class); @@ -54,13 +57,13 @@ public class FkCircularityTest extends TestCase { StringWriter writer = new StringWriter(); e.printStackTrace(new PrintWriter(writer)); log.debug(writer.toString()); - fail(e.getMessage()); + Assert.fail( e.getMessage() ); } } - + @Test public void testDeepJoinedSuclassesHierachy() { try { - AnnotationConfiguration config = new AnnotationConfiguration(); + Configuration config = new Configuration(); config.addAnnotatedClass(ClassA.class); config.addAnnotatedClass(ClassB.class); config.addAnnotatedClass(ClassC.class); @@ -76,7 +79,7 @@ public class FkCircularityTest extends TestCase { StringWriter writer = new StringWriter(); e.printStackTrace(new PrintWriter(writer)); log.debug(writer.toString()); - fail(e.getMessage()); + Assert.fail(e.getMessage()); } } } \ No newline at end of file diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/UUIDGenerator.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/UUIDGenerator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/UUIDGenerator.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/UUIDGenerator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Ball.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Ball.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Ball.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/BreakDance.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/BreakDance.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/BreakDance.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Bunny.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Bunny.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Bunny.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Computer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Computer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Computer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Computer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Department.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Department.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Department.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Department.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Dog.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Dog.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Dog.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Dog.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/FirTree.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/FirTree.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/FirTree.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/FirTree.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Footballer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Footballer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Footballer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Footballer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/FootballerPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/FootballerPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/FootballerPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Furniture.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Furniture.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Furniture.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Furniture.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/GoalKeeper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Home.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Home.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Home.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Home.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Location.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Location.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Location.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Location.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/MilitaryBuilding.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Monkey.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Monkey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Monkey.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Monkey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Phone.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Phone.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Phone.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Phone.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Planet.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Planet.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/PlanetCheatSheet.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/PointyTooth.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/PointyTooth.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/PointyTooth.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/PointyTooth.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Shoe.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Shoe.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Shoe.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Shoe.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/SoundSystem.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/SoundSystem.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/SoundSystem.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/SoundSystem.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Store.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Store.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Store.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Store.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Tower.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Tower.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Tower.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Tower.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Tree.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Tree.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/Tree.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/Tree.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/entities/TwinkleToes.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/package-info.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/package-info.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/id/package-info.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/id/package-info.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/DiscriminatorOptionsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/A.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/AddressEntry.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java similarity index 92% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java index d97ca30d34..1fe7d6fca4 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java @@ -14,8 +14,11 @@ import org.hibernate.cfg.Mappings; import org.hibernate.mapping.Table; import org.hibernate.service.ServiceRegistry; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; import org.hibernate.testing.ServiceRegistryBuilder; /** @@ -23,21 +26,21 @@ import org.hibernate.testing.ServiceRegistryBuilder; * * @author Hardy Ferentschik */ -public class NamingStrategyTest extends TestCase { +public class NamingStrategyTest { private static final Logger log = Logger.getLogger( NamingStrategyTest.class ); private ServiceRegistry serviceRegistry; - @Override - protected void setUp() { + @Before + public void setUp() { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - @Override - protected void tearDown() { + @After + public void tearDown() { if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } - + @Test public void testWithCustomNamingStrategy() throws Exception { try { AnnotationConfiguration config = new AnnotationConfiguration(); @@ -53,7 +56,7 @@ public class NamingStrategyTest extends TestCase { fail(e.getMessage()); } } - + @Test public void testWithEJB3NamingStrategy() throws Exception { try { AnnotationConfiguration config = new AnnotationConfiguration(); @@ -82,7 +85,7 @@ public class NamingStrategyTest extends TestCase { fail(e.getMessage()); } } - + @Test public void testWithoutCustomNamingStrategy() throws Exception { try { AnnotationConfiguration config = new AnnotationConfiguration(); diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/namingstrategy/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Body.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Body.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Body.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Body.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Client.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Client.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Client.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Computer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Computer.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Computer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/ComputerPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/ComputerPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ComputerPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Father.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Father.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Father.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Father.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Heart.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Heart.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Heart.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java similarity index 85% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java index 522b8e617d..09959cc0a3 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java @@ -1,6 +1,9 @@ //$Id$ package org.hibernate.test.annotations.onetoone; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.AnnotationException; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; @@ -10,7 +13,8 @@ import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard */ -public class OneToOneErrorTest extends junit.framework.TestCase { +public class OneToOneErrorTest { + @Test public void testWrongOneToOne() throws Exception { AnnotationConfiguration cfg = new AnnotationConfiguration(); cfg.addAnnotatedClass( Show.class ) @@ -20,7 +24,7 @@ public class OneToOneErrorTest extends junit.framework.TestCase { try { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); cfg.buildSessionFactory( serviceRegistry ); - fail( "Wrong mappedBy does not fail property" ); + Assert.fail( "Wrong mappedBy does not fail property" ); } catch (AnnotationException e) { //success diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Owner.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Owner.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Owner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OwnerAddress.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Party.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Party.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Party.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Party.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PartyAffiliate.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/PersonAddress.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PersonAddress.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/PersonAddress.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/PersonAddress.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/SerialNumber.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/SerialNumber.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/SerialNumberPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Show.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Show.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Show.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Show.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/ShowDescription.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/ShowDescription.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/ShowDescription.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Son.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Son.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Son.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Son.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Trousers.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/Trousers.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/Trousers.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/TrousersZip.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/TrousersZip.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/TrousersZip.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Address.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java similarity index 87% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java index 5108997ac7..befa6988d4 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java @@ -4,6 +4,9 @@ package org.hibernate.test.annotations.onetoone.primarykey; import org.jboss.logging.Logger; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.SQLServerDialect; @@ -16,9 +19,9 @@ import org.hibernate.testing.ServiceRegistryBuilder; * @author Hardy Ferentschik * */ -public class NullablePrimaryKeyTest extends TestCase { +public class NullablePrimaryKeyTest { private static final Logger log = Logger.getLogger( NullablePrimaryKeyTest.class ); - + @Test public void testGeneratedSql() { ServiceRegistry serviceRegistry = null; @@ -35,9 +38,9 @@ public class NullablePrimaryKeyTest extends TestCase { } String expectedMappingTableSql = "create table personAddress (address_id numeric(19,0) null, " + "person_id numeric(19,0) not null, primary key (person_id))"; - assertEquals("Wrong SQL", expectedMappingTableSql, schema[2]); + Assert.assertEquals( "Wrong SQL", expectedMappingTableSql, schema[2] ); } catch (Exception e) { - fail(e.getMessage()); + Assert.fail(e.getMessage()); } finally { if ( serviceRegistry != null ) { diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Administration.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Administration.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Administration.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Administration.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Availability.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Availability.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Availability.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Availability.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/BusTrip.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/BusTrip.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTrip.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/BusTripPk.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/BusTripPk.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/BusTripPk.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Competition.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Competition.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Competition.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Competition.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/LogListener.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/LogListener.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Match.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Match.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Match.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Match.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Organization.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Organization.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/Organization.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/Organization.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/OtherLogListener.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/OtherLogListener.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityMoralAccount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityNumber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/SocialSecurityPhysicalAccount.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/TennisMatch.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/TennisMatch.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/TennisMatch.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/XMLContextTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java similarity index 88% rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/XMLContextTest.java rename to hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java index 607d567c89..cfddb79eae 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/reflection/XMLContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/XMLContextTest.java @@ -10,20 +10,24 @@ import org.dom4j.io.SAXReader; import org.hibernate.cfg.EJB3DTDEntityResolver; import org.hibernate.cfg.annotations.reflection.XMLContext; import org.hibernate.internal.util.xml.XMLHelper; + +import org.junit.Assert; +import org.junit.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXNotSupportedException; /** * @author Emmanuel Bernard */ -public class XMLContextTest extends TestCase { +public class XMLContextTest { + @Test public void testAll() throws Exception { XMLHelper xmlHelper = new XMLHelper(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); InputStream is = cl.getResourceAsStream( "org/hibernate/test/annotations/reflection/orm.xml" ); - assertNotNull( "ORM.xml not found", is ); + Assert.assertNotNull( "ORM.xml not found", is ); XMLContext context = new XMLContext(); List errors = new ArrayList(); SAXReader saxReader = xmlHelper.createSAXReader( "XML InputStream", errors, EJB3DTDEntityResolver.INSTANCE ); @@ -47,7 +51,7 @@ public class XMLContextTest extends TestCase { //log.warn( "Could not close input stream", ioe ); } } - assertEquals( 0, errors.size() ); + Assert.assertEquals( 0, errors.size() ); context.addDocument( doc ); } } diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ast/ASTIteratorTest.java b/hibernate-core/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ast/ASTIteratorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ast/ASTIteratorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ast/ASTUtilTest.java b/hibernate-core/src/test/java/org/hibernate/test/ast/ASTUtilTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/ast/ASTUtilTest.java rename to hibernate-core/src/test/java/org/hibernate/test/ast/ASTUtilTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bytecode/Bean.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bytecode/Bean.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bytecode/Bean.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bytecode/Bean.java rename to hibernate-core/src/test/java/org/hibernate/test/bytecode/Bean.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bytecode/BeanReflectionHelper.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bytecode/BeanReflectionHelper.java rename to hibernate-core/src/test/java/org/hibernate/test/bytecode/BeanReflectionHelper.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bytecode/ProxyBean.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/ProxyBean.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bytecode/ProxyBean.java rename to hibernate-core/src/test/java/org/hibernate/test/bytecode/ProxyBean.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/bytecode/javassist/InvocationTargetExceptionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java rename to hibernate-core/src/test/java/org/hibernate/test/bytecode/javassist/ReflectionOptimizerTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/Cacheable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/cfg/Cacheable.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/Cacheable.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/cfg/Cacheable.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/CacheableFileTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/CacheableFileTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/CacheableFileTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/orm-serializable.xml b/hibernate-core/src/test/java/org/hibernate/test/cfg/orm-serializable.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/orm-serializable.xml rename to hibernate-core/src/test/java/org/hibernate/test/cfg/orm-serializable.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Gate.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Gate.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Gate.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Gate.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/GoofyException.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyException.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/GoofyException.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyException.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Palmtree.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Palmtree.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Palmtree.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Palmtree.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Portal.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Portal.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Portal.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Portal.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Tree.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Tree.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Tree.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Tree.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Window.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Window.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/cfg/persister/Window.java rename to hibernate-core/src/test/java/org/hibernate/test/cfg/persister/Window.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java similarity index 97% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java index 0aa985afe8..3320ba2528 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/dialect/function/AnsiTrimEmulationFunctionTest.java @@ -24,7 +24,10 @@ package org.hibernate.test.dialect.function; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; + +import org.junit.Test; + +import static org.junit.Assert.*; import org.hibernate.dialect.function.AnsiTrimEmulationFunction; /** @@ -32,9 +35,9 @@ import org.hibernate.dialect.function.AnsiTrimEmulationFunction; * * @author Steve Ebersole */ -public class AnsiTrimEmulationFunctionTest extends TestCase { +public class AnsiTrimEmulationFunctionTest { private static final String trimSource = "a.column"; - + @Test public void testBasicSqlServerProcessing() { AnsiTrimEmulationFunction function = new AnsiTrimEmulationFunction(); @@ -64,7 +67,7 @@ public class AnsiTrimEmulationFunctionTest extends TestCase { expected = expectedPostTrimPrefix + "ltrim(rtrim(" + expectedTrimPrep + "))" + expectedPostTrimSuffix; assertEquals( expected, rendered ); } - + @Test public void testBasicSybaseProcessing() { AnsiTrimEmulationFunction function = new AnsiTrimEmulationFunction( AnsiTrimEmulationFunction.LTRIM, diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/Product.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/Product.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/Product.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/function/Product.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/function/Product.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/AbstractLockHintTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/SQLServerLockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/SQLServerLockHintsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/SQLServerLockHintsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/SQLServerLockHintsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/SybaseASE15LockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/SybaseASE15LockHintsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/SybaseASE15LockHintsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/SybaseASE15LockHintsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/SybaseLockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/SybaseLockHintsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/dialect/unit/lockhint/SybaseLockHintsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/dialect/unit/lockhint/SybaseLockHintsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Customer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Customer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Customer.java rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/Customer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Employee.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Employee.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Employee.java b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Employee.java rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/Employee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/ExtendsTest.java b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/ExtendsTest.java rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/ExtendsTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Person.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Person.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Person.java b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/allinone.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/allinone.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/allinone.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/allinone.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/allseparateinone.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/entitynames.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/entitynames.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/entitynames.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/entitynames.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/packageentitynames.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/extendshbm/unionsubclass.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/A.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/A.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/A.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/A.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABC.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABC.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ABC.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCExtends.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCExtends.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ABCExtends.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCProxy.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ABCProxy.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ABCProxy.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Abstract.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Abstract.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Abstract.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Abstract.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/AbstractProxy.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/AbstractProxy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/AbstractProxy.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/AbstractProxy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/AltSimple.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/AltSimple.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/AltSimple.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Assignable.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Assignable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Assignable.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Assignable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/B.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/B.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/B.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/B.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Bar.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Bar.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Bar.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Bar.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/BarProxy.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/BarProxy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/BarProxy.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/BarProxy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/BasicNameable.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/BasicNameable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/BasicNameable.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/BasicNameable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Baz.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Baz.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Baz.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Baz.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Baz.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Blobber.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Blobber.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Blobber.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Blobber.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Blobber.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Broken.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Broken.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Broken.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Broken.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Broken.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/C1.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/C1.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/C1.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/C1.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/C2.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/C2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/C2.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/C2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Category.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Category.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Category.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Category.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Category.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Category.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Category.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Child.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Circular.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Circular.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Circular.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Circular.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Circular.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Commento.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Commento.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Commento.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Commento.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Company.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Company.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Company.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Company.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Component.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Component.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Component.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Component.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentCollection.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentCollection.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentCollection.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentCollection.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNull.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNull.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNull.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNull.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullMaster.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNullMaster.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullMaster.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ComponentNotNullMaster.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ComponentNotNullMaster.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Componentizable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Componentizable.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Componentizable.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Componentizable.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Componentizable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CompositeElement.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeElement.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/CompositeElement.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeElement.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CompositeIdId.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/CompositeIdId.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/CompositeIdId.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Contained.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Contained.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Contained.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Contained.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Container.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Container.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Container.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Container.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Container.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Container.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Container.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Custom.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Custom.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Custom.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Custom.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Custom.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomPersister.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomPersister.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/CustomPersister.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQL.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/CustomSQL.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/CustomSQL.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/D.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/D.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/D.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/D.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Detail.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Detail.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Detail.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Detail.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/DoubleStringType.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/DoubleStringType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/DoubleStringType.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/DoubleStringType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Down.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Down.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Down.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Down.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Drug.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Drug.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Drug.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Drug.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/E.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/E.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/E.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/E.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Eye.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Eye.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Eye.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Eye.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Eye.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fee.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fee.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fee.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fee.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fee.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fixed.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fixed.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fixed.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fixed.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fo.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fo.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Foo.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Foo.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Foo.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Foo.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBar.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBar.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/FooBar.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooComponent.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooComponent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooComponent.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/FooComponent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooProxy.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooProxy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooProxy.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/FooProxy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fum.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fum.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fum.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fum.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fum.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FumCompositeID.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FumCompositeID.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/FumCompositeID.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/FumCompositeID.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fumm.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fumm.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fumm.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Fumm.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Fumm.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Glarch.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Glarch.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Glarch.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Glarch.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Glarch.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/GlarchProxy.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/GlarchProxy.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/GlarchProxy.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/GlarchProxy.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Holder.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Holder.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Holder.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Holder.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Holder.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/I.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/I.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/I.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/I.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJ.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJ.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/IJ.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJ2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/IJ2.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/IJ2.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Immutable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Immutable.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Immutable.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Immutable.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Immutable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Inner.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Inner.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Inner.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Inner.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/InnerKey.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/InnerKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/InnerKey.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/InnerKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Intervention.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Intervention.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Intervention.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Intervention.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/J.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/J.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/J.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/J.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Jay.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Jay.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Jay.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Jay.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/K.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/K.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/K.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/K.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Location.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Location.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Location.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Location.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Location.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Location.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Location.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Lower.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Lower.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Lower.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Lower.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MainObject.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MainObject.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MainObject.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MainObject.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MainObject.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Many.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Many.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Many.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Many.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Many.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Many.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Many.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Map.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Map.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Map.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Map.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Marelo.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Marelo.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Marelo.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Marelo.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Master.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Master.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Master.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Master.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MasterDetail.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/MasterDetail.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MasterDetail.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MasterDetail.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Medication.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Medication.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Medication.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Medication.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Middle.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Middle.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Middle.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Middle.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Middle.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MiddleKey.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MiddleKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MiddleKey.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MiddleKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Mono.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Mono.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Mono.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Mono.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MoreStuff.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MoreStuff.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MoreStuff.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MoreStuff.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Multi.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Multi.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Multi.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Multi.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Multi.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MultiExtends.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MultiExtends.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MultiExtends.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Multiplicity.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Multiplicity.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Multiplicity.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Multiplicity.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/MultiplicityType.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/MultiplicityType.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/MultiplicityType.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/MultiplicityType.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Nameable.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Nameable.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Nameable.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Nameable.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Nameable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Named.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Named.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Named.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Named.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/NestingComponent.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/NestingComponent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/NestingComponent.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/NestingComponent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/NonReflectiveBinderTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Object2.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Object2.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Object2.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Object2.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Object2.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/One.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/One.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/One.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/One.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/One.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/One.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/One.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Outer.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Outer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Outer.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Outer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/OuterKey.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/OuterKey.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/OuterKey.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/OuterKey.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChild.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChild.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ParentChild.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Part.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Part.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Part.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Part.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Party.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Party.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Party.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Party.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Person.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Person.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Person.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Person.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Po.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Po.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Po.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Po.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Qux.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Qux.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Qux.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Qux.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Resource.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Resource.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Resource.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Resource.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Result.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Result.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Result.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Result.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ReverseComparator.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/ReverseComparator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/ReverseComparator.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/ReverseComparator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Role.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Role.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Role.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Role.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/S.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/S.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/S.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/S.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Several.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Several.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Several.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Several.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Simple.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Simple.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Simple.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Simple.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Single.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Single.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Single.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Single.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/SingleSeveral.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Sortable.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Sortable.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Sortable.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Sortable.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/StringComparator.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/StringComparator.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/StringComparator.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/StringComparator.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Stuff.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Stuff.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Stuff.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Stuff.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Stuff.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SubComponent.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SubComponent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/SubComponent.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/SubComponent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SubDetail.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SubDetail.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/SubDetail.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/SubDetail.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/SubMulti.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SubMulti.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/SubMulti.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/SubMulti.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Super.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Super.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Super.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Super.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Top.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Top.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Top.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Top.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Trivial.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Trivial.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Trivial.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Trivial.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/TrivialClass.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialClass.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/TrivialClass.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/TrivialClass.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Up.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Up.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Up.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Up.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/UpDown.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/UpDown.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/UpDown.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Vetoer.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Vetoer.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Vetoer.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Vetoer.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Vetoer.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/W.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/W.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/W.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/W.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/WZ.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/WZ.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/WZ.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Wicked.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Wicked.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Wicked.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/X.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/X.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/X.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/X.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/XY.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/XY.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/legacy/XY.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Y.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Y.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Y.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Y.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/Z.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Z.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/legacy/Z.java rename to hibernate-core/src/test/java/org/hibernate/test/legacy/Z.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/mapping/PersistentClassVisitorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapping/ValueVisitorTest.java b/hibernate-core/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mapping/ValueVisitorTest.java rename to hibernate-core/src/test/java/org/hibernate/test/mapping/ValueVisitorTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/mappingexception/InvalidMapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/InvalidMapping.java b/hibernate-core/src/test/java/org/hibernate/test/mappingexception/InvalidMapping.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/InvalidMapping.java rename to hibernate-core/src/test/java/org/hibernate/test/mappingexception/InvalidMapping.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/MappingExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/test/mappingexception/MappingExceptionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/MappingExceptionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/mappingexception/MappingExceptionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/User.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/mappingexception/User.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/User.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/mappingexception/User.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/User.java b/hibernate-core/src/test/java/org/hibernate/test/mappingexception/User.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/mappingexception/User.java rename to hibernate-core/src/test/java/org/hibernate/test/mappingexception/User.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/1_Version.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/2_Version.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/MigrationTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/MigrationTest.java rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/MigrationTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportManagedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportManagedConnectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportManagedConnectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportManagedConnectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportSuppliedConnectionTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java similarity index 92% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportTest.java rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java index 2834e59cd3..f30de872f3 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/SchemaExportTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/SchemaExportTest.java @@ -95,18 +95,13 @@ public abstract class SchemaExportTest extends BaseUnitTestCase { cfg.addResource( MAPPING ); SchemaExport schemaExport = createSchemaExport( cfg ); // should drop before creating, but tables don't exist yet - schemaExport.create( false, true ); - if ( doesDialectSupportDropTableIfExist() ) { - assertEquals( 0, schemaExport.getExceptions().size() ); - } - else { - assertEquals( 2, schemaExport.getExceptions().size() ); - } + schemaExport.create( true, true ); + assertEquals( 0, schemaExport.getExceptions().size() ); // call create again; it should drop tables before re-creating - schemaExport.create( false, true ); + schemaExport.create( true, true ); assertEquals( 0, schemaExport.getExceptions().size() ); // drop the tables - schemaExport.drop( false, true ); + schemaExport.drop( true, true ); assertEquals( 0, schemaExport.getExceptions().size() ); } } \ No newline at end of file diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/Version.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Version.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/Version.java rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/Version.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/mapping.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/schemaupdate/mapping.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/schemaupdate/mapping.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/JoinedIterableTest.java b/hibernate-core/src/test/java/org/hibernate/test/util/JoinedIterableTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/JoinedIterableTest.java rename to hibernate-core/src/test/java/org/hibernate/test/util/JoinedIterableTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/PropertiesHelperTest.java b/hibernate-core/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/PropertiesHelperTest.java rename to hibernate-core/src/test/java/org/hibernate/test/util/PropertiesHelperTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/Child.java b/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Child.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/Child.java rename to hibernate-core/src/test/java/org/hibernate/test/util/dtd/Child.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/EntityResolverTest.java b/hibernate-core/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/EntityResolverTest.java rename to hibernate-core/src/test/java/org/hibernate/test/util/dtd/EntityResolverTest.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/Parent.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/Parent.hbm.xml rename to hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.hbm.xml diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/Parent.java b/hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.java similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/Parent.java rename to hibernate-core/src/test/java/org/hibernate/test/util/dtd/Parent.java diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/child.xml b/hibernate-core/src/test/java/org/hibernate/test/util/dtd/child.xml similarity index 100% rename from hibernate-core/src/matrix/java/org/hibernate/test/util/dtd/child.xml rename to hibernate-core/src/test/java/org/hibernate/test/util/dtd/child.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/Boat.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/Boat.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/Boat.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/Ferry.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/Ferry.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/Ferry.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Boy.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Boy.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Boy.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Cook.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Cook.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Cook.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Crew.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Crew.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Crew.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/RentalCar.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/access/xml/Tourist4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/bytecode/Hammer.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/configuration/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/configuration/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/configuration/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/duplicatedgenerator/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/hibernate.cfg.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/hibernate.cfg.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/hibernate.cfg.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/idclass/xml/HabitatSpeciesLink.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/inheritance/joined/Asset.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/loader/Loader.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/onetomany/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/onetomany/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/onetomany/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/onetoone/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/onetoone/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/onetoone/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/query/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/query/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/query/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/query/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/metadata-complete.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/reflection/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/reflection/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/reflection/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm2.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm3.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm4.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/A.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/B.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/CloudType.hbm.xml diff --git a/hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml similarity index 100% rename from hibernate-core/src/matrix/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml rename to hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/hbm/Government.hbm.xml diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java index 64aca7afa5..1c6301e61e 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java @@ -23,14 +23,17 @@ */ package org.hibernate.ejb.test.util; import javax.persistence.spi.LoadState; -import org.hibernate.ejb.util.PersistenceUtilHelper; +import org.junit.Test; + +import org.hibernate.ejb.util.PersistenceUtilHelper; +import static org.junit.Assert.*; /** * Tests for HHH-5094 and HHH-5334 * * @author Hardy Ferentschik */ -public class PersistenceUtilHelperTest extends junit.framework.TestCase { +public class PersistenceUtilHelperTest{ private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache(); public static class FieldAccessBean extends FieldAccessBeanBase { @@ -62,14 +65,14 @@ public class PersistenceUtilHelperTest extends junit.framework.TestCase { return publicAccessProperty; } } - + @Test public void testIsLoadedWithReferencePublicField() { assertEquals( LoadState.UNKNOWN, PersistenceUtilHelper.isLoadedWithReference( new FieldAccessBean(), "publicAccessProperty", cache ) ); } - + @Test public void testIsLoadedWithReferencePublicMethod() { assertEquals( LoadState.UNKNOWN, @@ -78,14 +81,14 @@ public class PersistenceUtilHelperTest extends junit.framework.TestCase { ) ); } - + @Test public void testIsLoadedWithReferenceProtectedField() { assertEquals( LoadState.UNKNOWN, PersistenceUtilHelper.isLoadedWithReference( new FieldAccessBean(), "protectedAccessProperty", cache ) ); } - + @Test public void testIsLoadedWithReferenceProtectedMethod() { assertEquals( LoadState.UNKNOWN, @@ -94,14 +97,14 @@ public class PersistenceUtilHelperTest extends junit.framework.TestCase { ) ); } - + @Test public void testIsLoadedWithReferencePrivateField() { assertEquals( LoadState.UNKNOWN, PersistenceUtilHelper.isLoadedWithReference( new FieldAccessBean(), "privateAccessProperty", cache ) ); } - + @Test public void testIsLoadedWithReferencePrivateMethod() { assertEquals( LoadState.UNKNOWN, diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java index 6fcd2845e3..942a65344c 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java @@ -23,12 +23,16 @@ package org.hibernate.ejb.test.connection; import java.io.File; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.HibernatePersistence; /** * @author Emmanuel Bernard */ -public class DataSourceInjectionTest extends TestCase { +public class DataSourceInjectionTest { + @Test public void testDatasourceInjection() throws Exception { File current = new File("."); File sub = new File(current, "puroot"); @@ -36,7 +40,7 @@ public class DataSourceInjectionTest extends TestCase { PersistenceUnitInfoImpl info = new PersistenceUnitInfoImpl( sub.toURI().toURL(), new String[]{} ); try { new HibernatePersistence().createContainerEntityManagerFactory( info, null ); - fail( "FakeDatasource should have been used" ); + Assert.fail( "FakeDatasource should have been used" ); } catch (FakeDataSourceException fde) { //success diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java index eb80844253..398cbb7199 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java @@ -22,133 +22,179 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.test.ejb3configuration; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; + +import org.junit.Test; + +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.Dialect; import org.hibernate.ejb.AvailableSettings; +import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.test.Distributor; import org.hibernate.ejb.test.Item; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Emmanuel Bernard */ -public class InterceptorTest extends TestCase { +public class InterceptorTest { + @Test + public void testInjectedInterceptor() { + EntityManagerFactory emf = constructConfiguration().setInterceptor( new ExceptionInterceptor() ) + .createEntityManagerFactory(); + EntityManager em = emf.createEntityManager(); + Item i = new Item(); + i.setName( "Laptop" ); + try { + em.getTransaction().begin(); + em.persist( i ); + em.getTransaction().commit(); + } + catch ( IllegalStateException e ) { + assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); + } + finally { + if ( em.getTransaction() != null && em.getTransaction().isActive() ) { + em.getTransaction().rollback(); + } + em.close(); + emf.close(); + } + } - public void testInjectedInterceptor() { - configuration.setInterceptor( new ExceptionInterceptor() ); - EntityManagerFactory emf = configuration.createEntityManagerFactory(); - EntityManager em = emf.createEntityManager(); - Item i = new Item(); - i.setName( "Laptop" ); - try { - em.getTransaction().begin(); - em.persist( i ); - em.getTransaction().commit(); - } - catch (IllegalStateException e) { - assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); - } - finally { - if ( em.getTransaction() != null && em.getTransaction().isActive() ) em.getTransaction().rollback(); - em.close(); - emf.close(); - } - } + @Test + public void testConfiguredInterceptor() { + EntityManagerFactory emf = constructConfiguration().setProperty( + AvailableSettings.INTERCEPTOR, + ExceptionInterceptor.class.getName() + ).createEntityManagerFactory(); + EntityManager em = emf.createEntityManager(); + Item i = new Item(); + i.setName( "Laptop" ); + try { + em.getTransaction().begin(); + em.persist( i ); + em.getTransaction().commit(); + fail( "No interceptor" ); + } + catch ( IllegalStateException e ) { + assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); + } + finally { + if ( em.getTransaction() != null && em.getTransaction().isActive() ) { + em.getTransaction().rollback(); + } + em.close(); + emf.close(); + } + } - public void testConfiguredInterceptor() { - configuration.setProperty( AvailableSettings.INTERCEPTOR, ExceptionInterceptor.class.getName() ); - EntityManagerFactory emf = configuration.createEntityManagerFactory(); - EntityManager em = emf.createEntityManager(); - Item i = new Item(); - i.setName( "Laptop" ); - try { - em.getTransaction().begin(); - em.persist( i ); - em.getTransaction().commit(); - fail( "No interceptor" ); - } - catch (IllegalStateException e) { - assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); - } - finally { - if ( em.getTransaction() != null && em.getTransaction().isActive() ) em.getTransaction().rollback(); - em.close(); - emf.close(); - } - } + @Test + public void testConfiguredSessionInterceptor() { + EntityManagerFactory emf = constructConfiguration().setProperty( + AvailableSettings.SESSION_INTERCEPTOR, + LocalExceptionInterceptor.class.getName() + ).setProperty( "aaaaaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbbbb" ).createEntityManagerFactory(); + EntityManager em = emf.createEntityManager(); + Item i = new Item(); + i.setName( "Laptop" ); + try { + em.getTransaction().begin(); + em.persist( i ); + em.getTransaction().commit(); + fail( "No interceptor" ); + } + catch ( IllegalStateException e ) { + assertEquals( LocalExceptionInterceptor.LOCAL_EXCEPTION_MESSAGE, e.getMessage() ); + } + finally { + if ( em.getTransaction() != null && em.getTransaction().isActive() ) { + em.getTransaction().rollback(); + } + em.close(); + emf.close(); + } + } - public void testConfiguredSessionInterceptor() { - configuration.setProperty( AvailableSettings.SESSION_INTERCEPTOR, LocalExceptionInterceptor.class.getName() ); - configuration.setProperty( "aaaaaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbbbb" ); - EntityManagerFactory emf = configuration.createEntityManagerFactory(); - EntityManager em = emf.createEntityManager(); - Item i = new Item(); - i.setName( "Laptop" ); - try { - em.getTransaction().begin(); - em.persist( i ); - em.getTransaction().commit(); - fail( "No interceptor" ); - } - catch (IllegalStateException e) { - assertEquals( LocalExceptionInterceptor.LOCAL_EXCEPTION_MESSAGE, e.getMessage() ); - } - finally { - if ( em.getTransaction() != null && em.getTransaction().isActive() ) em.getTransaction().rollback(); - em.close(); - emf.close(); - } - } + @Test + public void testEmptyCreateEntityManagerFactoryAndPropertyUse() { + EntityManagerFactory emf = constructConfiguration().setProperty( + AvailableSettings.INTERCEPTOR, + ExceptionInterceptor.class.getName() + ).createEntityManagerFactory(); + EntityManager em = emf.createEntityManager(); + Item i = new Item(); + i.setName( "Laptop" ); + try { + em.getTransaction().begin(); + em.persist( i ); + em.getTransaction().commit(); + fail( "No interceptor" ); + } + catch ( IllegalStateException e ) { + assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); + } + finally { + if ( em.getTransaction() != null && em.getTransaction().isActive() ) { + em.getTransaction().rollback(); + } + em.close(); + emf.close(); + } + } - public void testEmptyCreateEntityManagerFactoryAndPropertyUse() { - configuration.setProperty( AvailableSettings.INTERCEPTOR, ExceptionInterceptor.class.getName() ); - EntityManagerFactory emf = configuration.createEntityManagerFactory(); - EntityManager em = emf.createEntityManager(); - Item i = new Item(); - i.setName( "Laptop" ); - try { - em.getTransaction().begin(); - em.persist( i ); - em.getTransaction().commit(); - fail( "No interceptor" ); - } - catch (IllegalStateException e) { - assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); - } - finally { - if ( em.getTransaction() != null && em.getTransaction().isActive() ) em.getTransaction().rollback(); - em.close(); - emf.close(); - } - } + @Test + public void testOnLoadCallInInterceptor() { + EntityManagerFactory emf = constructConfiguration().setInterceptor( new ExceptionInterceptor( true ) ) + .createEntityManagerFactory(); + EntityManager em = emf.createEntityManager(); + Item i = new Item(); + i.setName( "Laptop" ); + em.getTransaction().begin(); + em.persist( i ); + em.flush(); + em.clear(); + try { + em.find( Item.class, i.getName() ); + fail( "No interceptor" ); + } + catch ( IllegalStateException e ) { + assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); + } + finally { + if ( em.getTransaction() != null && em.getTransaction().isActive() ) { + em.getTransaction().rollback(); + } + em.close(); + emf.close(); + } + } - public void testOnLoadCallInInterceptor() { - configuration.setInterceptor( new ExceptionInterceptor(true) ); - EntityManagerFactory emf = configuration.createEntityManagerFactory(); - EntityManager em = emf.createEntityManager(); - Item i = new Item(); - i.setName( "Laptop" ); - em.getTransaction().begin(); - em.persist( i ); - em.flush(); - em.clear(); - try { - em.find(Item.class, i.getName() ); - fail( "No interceptor" ); - } - catch (IllegalStateException e) { - assertEquals( ExceptionInterceptor.EXCEPTION_MESSAGE, e.getMessage() ); - } - finally { - if ( em.getTransaction() != null && em.getTransaction().isActive() ) em.getTransaction().rollback(); - em.close(); - emf.close(); - } - } - public Class[] getAnnotatedClasses() { - return new Class[]{ - Item.class, - Distributor.class - }; - } + protected Ejb3Configuration constructConfiguration() { + Ejb3Configuration ejb3Configuration = new Ejb3Configuration(); + ejb3Configuration.getHibernateConfiguration().setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); + ejb3Configuration + .getHibernateConfiguration() + .setProperty( org.hibernate.cfg.AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); + ejb3Configuration + .getHibernateConfiguration() + .setProperty( Environment.DIALECT, Dialect.getDialect().getClass().getName() ); + for ( Class clazz : getAnnotatedClasses() ) { + ejb3Configuration.addAnnotatedClass( clazz ); + } + return ejb3Configuration; + } + + public Class[] getAnnotatedClasses() { + return new Class[] { + Item.class, + Distributor.class + }; + } + } diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java index 8ea49b15c9..e6891290ac 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java @@ -26,6 +26,9 @@ import java.io.Serializable; import java.util.Comparator; import java.util.Map; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -57,7 +60,8 @@ import org.hibernate.type.VersionType; /** * @author Emmanuel Bernard */ -public class PersisterClassProviderTest extends junit.framework.TestCase { +public class PersisterClassProviderTest { + @Test public void testPersisterClassProvider() { Ejb3Configuration conf = new Ejb3Configuration(); conf.getProperties().put( PersisterClassResolverInitiator.IMPL_NAME, GoofyPersisterClassProvider.class ); @@ -67,9 +71,9 @@ public class PersisterClassProviderTest extends junit.framework.TestCase { entityManagerFactory.close(); } catch ( PersistenceException e ) { - assertNotNull( e.getCause() ); - assertNotNull( e.getCause().getCause() ); - assertEquals( GoofyException.class, e.getCause().getCause().getClass() ); + Assert.assertNotNull( e.getCause() ); + Assert.assertNotNull( e.getCause().getCause() ); + Assert.assertEquals( GoofyException.class, e.getCause().getCause().getClass() ); } } diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java index d9b5bd7680..04fc8ad788 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java @@ -6,6 +6,10 @@ import java.util.Date; import java.util.Properties; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.cfg.Environment; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.test.Cat; @@ -15,8 +19,8 @@ import org.hibernate.internal.util.ConfigHelper; /** * @author Emmanuel Bernard */ -public class ProgrammaticConfTest extends junit.framework.TestCase { - +public class ProgrammaticConfTest { + @Test public void testProgrammaticAPI() throws Exception { Ejb3Configuration conf = new Ejb3Configuration(); conf.addAnnotatedClass( Cat.class ); @@ -32,11 +36,11 @@ public class ProgrammaticConfTest extends junit.framework.TestCase { em.getTransaction().begin(); em.persist( cat ); em.flush(); - assertNotNull( em.find(Cat.class, cat.getId() ) ); + Assert.assertNotNull( em.find( Cat.class, cat.getId() ) ); em.getTransaction().rollback(); emf.close(); } - + @Test public void testProgrammaticCfg() throws Exception { Ejb3Configuration conf = new Ejb3Configuration(); conf.configure( "org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml" ); @@ -51,7 +55,7 @@ public class ProgrammaticConfTest extends junit.framework.TestCase { em.getTransaction().begin(); em.persist( cat ); em.flush(); - assertNotNull( em.find(Cat.class, cat.getId() ) ); + Assert.assertNotNull( em.find(Cat.class, cat.getId() ) ); em.getTransaction().rollback(); emf.close(); } diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/SessionFactoryObserverTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/SessionFactoryObserverTest.java index b3063c1da1..e0e132b113 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/SessionFactoryObserverTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/SessionFactoryObserverTest.java @@ -22,6 +22,9 @@ package org.hibernate.ejb.test.ejb3configuration; import javax.persistence.EntityManagerFactory; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.SessionFactory; import org.hibernate.SessionFactoryObserver; import org.hibernate.ejb.AvailableSettings; @@ -30,7 +33,8 @@ import org.hibernate.ejb.Ejb3Configuration; /** * @author Emmanuel Bernard */ -public class SessionFactoryObserverTest extends junit.framework.TestCase { +public class SessionFactoryObserverTest { + @Test public void testSessionFactoryObserverProperty() { Ejb3Configuration conf = new Ejb3Configuration(); conf.setProperty( AvailableSettings.SESSION_FACTORY_OBSERVER, GoofySessionFactoryObserver.class.getName() ); @@ -38,7 +42,7 @@ public class SessionFactoryObserverTest extends junit.framework.TestCase { try { final EntityManagerFactory entityManagerFactory = conf.buildEntityManagerFactory(); entityManagerFactory.close(); - fail( "GoofyException should have been thrown" ); + Assert.fail( "GoofyException should have been thrown" ); } catch ( GoofyException e ) { //success diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java index 38394138aa..189e2d2590 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java @@ -24,6 +24,8 @@ import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.Ejb3Configuration; @@ -31,7 +33,8 @@ import org.hibernate.ejb.Ejb3Configuration; /** * @author Emmanuel Bernard */ -public class IdentifierGeneratorStrategyProviderTest extends TestCase { +public class IdentifierGeneratorStrategyProviderTest { + @Test public void testIdentifierGeneratorStrategyProvider() { Ejb3Configuration conf = new Ejb3Configuration(); conf.setProperty( @@ -43,7 +46,7 @@ public class IdentifierGeneratorStrategyProviderTest extends TestCase { try { entityManager.persist( new Cable() ); entityManager.flush(); - fail("FunkyException should have been thrown when the id is generated"); + Assert.fail( "FunkyException should have been thrown when the id is generated" ); } catch ( FunkyException e ) { entityManager.close(); diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java index 161912405f..fa4124c470 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java @@ -4,17 +4,20 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; /** * @author Emmanuel Bernard * @author Hardy Ferentschik */ -public class InterceptFieldClassFileTransformerTest extends TestCase { +public class InterceptFieldClassFileTransformerTest { /** * Tests that class file enhancement works. * * @throws Exception in case the test fails. */ + @Test public void testEnhancement() throws Exception { List entities = new ArrayList(); entities.add( "org.hibernate.ejb.test.instrument.Simple" ); @@ -22,7 +25,7 @@ public class InterceptFieldClassFileTransformerTest extends TestCase { // sanity check that the class is unmodified and does not contain getFieldHandler() try { org.hibernate.ejb.test.instrument.Simple.class.getDeclaredMethod( "getFieldHandler" ); - fail(); + Assert.fail(); } catch ( NoSuchMethodException nsme ) { // success } @@ -35,6 +38,6 @@ public class InterceptFieldClassFileTransformerTest extends TestCase { // javassist is our default byte code enhancer. Enhancing will eg add the method getFieldHandler() // see org.hibernate.bytecode.internal.javassist.FieldTransformer Method method = clazz.getDeclaredMethod( "getFieldHandler" ); - assertNotNull( method ); + Assert.assertNotNull( method ); } } diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java index a83b7cc3b1..357f10becc 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java @@ -35,6 +35,9 @@ import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.InvalidMappingException; import org.hibernate.ejb.HibernatePersistence; @@ -43,7 +46,8 @@ import org.hibernate.ejb.HibernatePersistence; * * @author Steve Ebersole */ -public class OrmVersionTest extends TestCase { +public class OrmVersionTest { + @Test public void testOrm1() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm1-test", "1.0" ) .addMappingFileName( "org/hibernate/ejb/test/jee/valid-orm-1.xml" ); @@ -51,7 +55,7 @@ public class OrmVersionTest extends TestCase { EntityManagerFactory emf = hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); emf.getMetamodel().entity( org.hibernate.ejb.test.pack.defaultpar_1_0.Lighter1.class ); // exception if not entity } - + @Test public void testOrm2() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "orm2-test", "2.0" ) .addMappingFileName( "org/hibernate/ejb/test/jee/valid-orm-2.xml" ); @@ -59,14 +63,14 @@ public class OrmVersionTest extends TestCase { EntityManagerFactory emf = hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); emf.getMetamodel().entity( org.hibernate.ejb.test.pack.defaultpar.Lighter.class ); // exception if not entity } - + @Test public void testInvalidOrm1() { PersistenceUnitInfoImpl pui = new PersistenceUnitInfoImpl( "invalid-orm1-test", "1.0" ) .addMappingFileName( "org/hibernate/ejb/test/jee/invalid-orm-1.xml" ); HibernatePersistence hp = new HibernatePersistence(); try { hp.createContainerEntityManagerFactory( pui, Collections.EMPTY_MAP ); - fail( "expecting 'invalid content' error" ); + Assert.fail( "expecting 'invalid content' error" ); } catch ( InvalidMappingException expected ) { // expected condition diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java index ed3f9e74a5..a2d72003b2 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java @@ -36,7 +36,7 @@ import javax.naming.StringRefAddr; import javax.transaction.Status; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import junit.framework.TestCase; +import static org.junit.Assert.*; import org.enhydra.jdbc.standard.StandardXADataSource; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -55,6 +55,9 @@ import org.jboss.util.naming.NonSerializableFactory; import org.jnp.interfaces.NamingContext; import org.jnp.server.Main; import org.jnp.server.NamingServer; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * This is an example test based on http://community.jboss.org/docs/DOC-14617 that shows how to interact with @@ -66,16 +69,15 @@ import org.jnp.server.NamingServer; * @author Galder Zamarreño * @since 3.5 */ -public class JBossStandaloneJtaExampleTest extends TestCase { +public class JBossStandaloneJtaExampleTest { private static final Log log = LogFactory.getLog(JBossStandaloneJtaExampleTest.class); private static final JBossStandaloneJTAManagerLookup lookup = new JBossStandaloneJTAManagerLookup(); Context ctx; Main jndiServer; private ServiceRegistry serviceRegistry; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); jndiServer = startJndiServer(); ctx = createJndiContext(); @@ -86,10 +88,9 @@ public class JBossStandaloneJtaExampleTest extends TestCase { bindDataSource(); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { try { - super.tearDown(); ctx.close(); jndiServer.stop(); } @@ -99,7 +100,7 @@ public class JBossStandaloneJtaExampleTest extends TestCase { } } } - + @Test public void testPersistAndLoadUnderJta() throws Exception { Item item; SessionFactory sessionFactory = buildSessionFactory(); diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java index d9ef795ee6..1d59d42fde 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java @@ -451,9 +451,9 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase { for ( Object element : list ) { Integer l = items.get( tmpSession.getEntityName( element ) ); if ( l == null ) { - l = Integer.valueOf( 0 ); + l = 0; } - l = Integer.valueOf( l.intValue() + 1 ) ; + l = l + 1 ; items.put( tmpSession.getEntityName( element ), l ); System.out.println( "Data left: " + element ); }