[hibernate-commits] Hibernate SVN: r19399 - in annotations/branches/v3_4_0_GA_CP: src/test/java/org/hibernate/test/annotations and 52 other directories.

Author: stliu Date: 2010-05-07 03:18:16 -0400 (Fri, 07 May 2010) New Revision: 19399 Added: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java Removed: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java Modified: annotations/branches/v3_4_0_GA_CP/pom.xml annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java Log: JBPAPP-4235 HHH-4822 Add @FailureExpected annotation to annotations and entitymananger modules to allow the skipping of tests Modified: annotations/branches/v3_4_0_GA_CP/pom.xml =================================================================== --- annotations/branches/v3_4_0_GA_CP/pom.xml 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/pom.xml 2010-05-07 07:18:16 UTC (rev 19399) @@ -64,6 +64,12 @@ <artifactId>javassist</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-testing</artifactId> + <version>3.3.2.GA_CP01</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -136,36 +142,22 @@ </descriptors> </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://java.sun.com/j2se/1.5.0/docs/api/</link> - <link>http://java.sun.com/javaee/5/docs/api/</link> - <link>http://docs.jboss.org/hibernate/stable/core/api</link> - </links> - <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile> - </configuration> - <executions> - <execution> - <id>make-javadoc</id> - <phase>package</phase> - <goals> - <goal>javadoc</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <releaseProfiles>release</releaseProfiles> - <goals>package javadoc:javadoc org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:resources org.jboss.maven.plugins:maven-jdocbook-plugin:2.1.0:generate assembly:assembly - </goals> - </configuration> - </plugin> </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://java.sun.com/j2se/1.5.0/docs/api/</link> + <link>http://java.sun.com/javaee/5/docs/api/</link> + <link>http://docs.jboss.org/hibernate/stable/core/api</link> + </links> + <stylesheetfile>${basedir}/src/main/javadoc/jdstyle.css</stylesheetfile> + </configuration> + </plugin> + </plugins> + </reporting> </project> Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/EntityTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -376,9 +376,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Flight.class, Company.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/JoinedSubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -93,9 +93,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Boat.class, Ferry.class, Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/RequiresDialect.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -1,20 +0,0 @@ -// $Id$ -package org.hibernate.test.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.hibernate.dialect.Dialect; - -/** - * Annotations used to mark a test to be specific to a given dialect. - * - * @author Hardy Ferentschik - */ -(a)Target({ElementType.METHOD, ElementType.TYPE}) -(a)Retention(RetentionPolicy.RUNTIME) -public @interface RequiresDialect { - Class<? extends Dialect>[] value(); -} Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/TestCase.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -1,86 +1,113 @@ //$Id$ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.test.annotations; import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; -import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.dialect.Dialect; -import org.hibernate.jdbc.Work; -import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.engine.SessionFactoryImplementor; /** - * A base class for all tests. + * A base class for all annotation tests. * * @author Emmnauel Bernand * @author Hardy Ferentschik */ -public abstract class TestCase extends junit.framework.TestCase { +public abstract class TestCase extends HibernateTestCase { - public static final Logger log = LoggerFactory.getLogger( TestCase.class ); - - private static SessionFactory sessions; - private static AnnotationConfiguration cfg; - private static Class<?> lastTestClass; + protected static SessionFactory sessions; private Session session; - /** - * The test method. - */ - private Method runMethod = null; + public TestCase() { + super(); + } - /** - * Flag indicating whether the test should be run or skipped. - */ - private boolean runTest = true; + public TestCase(String name) { + super( name ); + } - /** - * List of required dialect for the current {@code runMethod}. If the list is empty any dialect is allowed. - * Otherwise the current dialect or a superclass of the current dialect must be in the list. - */ - private final Set<Class<? extends Dialect>> requiredDialectList = new HashSet<Class<? extends Dialect>>(); + public Session openSession() throws HibernateException { + rebuildSessionFactory(); + session = getSessions().openSession(); + return session; + } - public TestCase() { - super(); + public Session openSession(Interceptor interceptor) throws HibernateException { + rebuildSessionFactory(); + session = getSessions().openSession( interceptor ); + return session; } - public TestCase(String x) { - super( x ); + private void rebuildSessionFactory() { + if ( sessions == null ) { + try { + buildConfiguration(); + } + catch ( Exception e ) { + throw new HibernateException( e ); + } + } + } + + protected void setSessions(SessionFactory sessions) { + TestCase.sessions = sessions; } - protected void buildSessionFactory(Class<?>[] classes, String[] packages, String[] xmlFiles) throws Exception { + protected SessionFactory getSessions() { + return sessions; + } + protected SessionFactoryImplementor sfi() { + return (SessionFactoryImplementor) getSessions(); + } + + @Override + protected void buildConfiguration() throws Exception { if ( getSessions() != null ) { getSessions().close(); } try { setCfg( new AnnotationConfiguration() ); + // by default use the new id generator scheme... + //cfg.setProperty( AnnotationConfiguration.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); configure( cfg ); if ( recreateSchema() ) { cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); } - for ( String aPackage : packages ) { - getCfg().addPackage( aPackage ); + for ( String aPackage : getAnnotatedPackages() ) { + ( ( AnnotationConfiguration ) getCfg() ).addPackage( aPackage ); } - for ( Class<?> aClass : classes ) { - getCfg().addAnnotatedClass( aClass ); + for ( Class<?> aClass : getAnnotatedClasses() ) { + ( ( AnnotationConfiguration ) getCfg() ).addAnnotatedClass( aClass ); } - for ( String xmlFile : xmlFiles ) { + for ( String xmlFile : getXmlFiles() ) { InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile ); getCfg().addInputStream( is ); } @@ -92,111 +119,8 @@ } } - protected void setUp() throws Exception { - runMethod = findTestMethod(); - setRunTestFlag( runMethod ); - if ( runTest ) { - if ( getSessions() == null || lastTestClass != getClass() ) { - buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles() ); - lastTestClass = getClass(); - } - else { - runSchemaGeneration(); - } - } - } - - protected void runTest() throws Throwable { - try { - if ( runTest ) { - runTestMethod( runMethod ); - handleUnclosedSession(); - } - } - catch ( Throwable e ) { - closeSession( e ); - } - } - - private void setRunTestFlag(Method runMethod) { - updateRequiredDialectList( runMethod ); - - if ( runForCurrentDialect() ) { - runTest = true; - } - else { - log.warn( - "Skipping test {}, because test does not apply for dialect {}", runMethod.getName(), Dialect - .getDialect().getClass() - ); - runTest = false; - } - } - - private void updateRequiredDialectList(Method runMethod) { - requiredDialectList.clear(); - - RequiresDialect requiresDialectMethodAnn = runMethod.getAnnotation( RequiresDialect.class ); - if ( requiresDialectMethodAnn != null ) { - Class<? extends Dialect>[] requiredDialects = requiresDialectMethodAnn.value(); - requiredDialectList.addAll( Arrays.asList( requiredDialects ) ); - } - - RequiresDialect requiresDialectClassAnn = getClass().getAnnotation( RequiresDialect.class ); - if ( requiresDialectClassAnn != null ) { - Class<? extends Dialect>[] requiredDialects = requiresDialectClassAnn.value(); - requiredDialectList.addAll( Arrays.asList( requiredDialects ) ); - } - } - - protected boolean runForCurrentDialect() { - if ( requiredDialectList.isEmpty() ) { - return true; - } - else { - // check whether the current dialect is assignableFrom from any of the specified required dialects. - for ( Class<? extends Dialect> dialect : requiredDialectList ) { - if ( ( dialect.isAssignableFrom( Dialect.getDialect().getClass() ) ) && appliesTo( Dialect.getDialect() ) ){ - return true; - } - } - return false; - } - } - protected boolean appliesTo( Dialect dialect ){ - return true; - } - private void runTestMethod(Method runMethod) throws Throwable { - try { - runMethod.invoke( this, new Class[0] ); - } - catch ( InvocationTargetException e ) { - e.fillInStackTrace(); - throw e.getTargetException(); - } - catch ( IllegalAccessException e ) { - e.fillInStackTrace(); - throw e; - } - } - - private Method findTestMethod() { - String fName = getName(); - assertNotNull( fName ); - Method runMethod = null; - try { - runMethod = getClass().getMethod( fName, null ); - } - catch ( NoSuchMethodException e ) { - fail( "Method \"" + fName + "\" not found" ); - } - if ( !Modifier.isPublic( runMethod.getModifiers() ) ) { - fail( "Method \"" + fName + "\" should be public" ); - } - return runMethod; - } - - private void handleUnclosedSession() { + @Override + protected void handleUnclosedResources() { if ( session != null && session.isOpen() ) { if ( session.isConnected() ) { session.doWork( new RollbackWork() ); @@ -210,7 +134,8 @@ } } - private void closeSession(Throwable e) throws Throwable { + @Override + protected void closeResources() { try { if ( session != null && session.isOpen() ) { if ( session.isConnected() ) { @@ -229,65 +154,5 @@ } catch ( Exception ignore ) { } - throw e; } - - public Session openSession() throws HibernateException { - session = getSessions().openSession(); - return session; - } - - public Session openSession(Interceptor interceptor) throws HibernateException { - session = getSessions().openSession( interceptor ); - return session; - } - - protected abstract Class<?>[] getMappings(); - - protected String[] getAnnotatedPackages() { - return new String[] { }; - } - - protected String[] getXmlFiles() { - return new String[] { }; - } - - private void setSessions(SessionFactory sessions) { - TestCase.sessions = sessions; - } - - protected SessionFactory getSessions() { - return sessions; - } - - protected Dialect getDialect() { - return Dialect.getDialect(); - } - - protected static void setCfg(AnnotationConfiguration cfg) { - TestCase.cfg = cfg; - } - - protected static AnnotationConfiguration getCfg() { - return cfg; - } - - protected void configure(Configuration cfg) { - } - - protected boolean recreateSchema() { - return true; - } - - protected void runSchemaGeneration() { - SchemaExport export = new SchemaExport( cfg ); - export.create( true, true ); - } - - public class RollbackWork implements Work { - - public void execute(Connection connection) throws SQLException { - connection.rollback(); - } - } } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/access/AccessTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -116,7 +116,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Bed.class, Chair.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/any/AnyTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -138,7 +138,7 @@ } @Override - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { StringProperty.class, IntegerProperty.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/array/ArrayTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -45,7 +45,7 @@ } @SuppressWarnings("unchecked") - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Competitor.class, Contest.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/bytecode/ProxyBreakingTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -35,7 +35,7 @@ super( name ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[0]; } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cascade/CascadeTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -106,7 +106,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Mouth.class, Tooth.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/cid/CompositeIdTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -1,17 +1,12 @@ //$Id$ package org.hibernate.test.annotations.cid; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.criterion.Disjunction; -import org.hibernate.criterion.Restrictions; -import org.hibernate.dialect.Dialect; import org.hibernate.test.annotations.TestCase; /** @@ -319,7 +314,7 @@ // transaction.rollback(); // s.close(); // } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Parent.class, Child.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -202,7 +202,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Boy.class, Country.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/deepcollectionelements/DeepCollectionElementTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -15,7 +15,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { //A.class, //B.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -24,7 +24,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Sale.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/embedded/EmbeddedTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -369,7 +369,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Person.class, RegionalArticle.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/BasicHibernateAnnotationsTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -344,7 +344,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Forest.class, Tree.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/Java5FeaturesTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -115,7 +115,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Race.class, Bid.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entity/PropertyDefaultMappingsTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -54,7 +54,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Address.class, WashingMachine.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/entitynonentity/EntityNonEntityTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -33,7 +33,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Phone.class, Voice.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/fetch/FetchingTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -114,7 +114,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Person.class, Stay.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/EmbeddedGenericsTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -47,7 +47,7 @@ session.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Classes.Book.class, Classes.PopularBook.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/GenericsTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -48,7 +48,7 @@ super.configure( cfg ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Paper.class, PaperType.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/generics/UnresolvedTypeTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -34,7 +34,7 @@ } @Override - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Gene.class, DNA.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/genericsinheritance/GenericsInheritanceTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -13,7 +13,7 @@ s.close(); //mapping is tested } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { ChildHierarchy1.class, ParentHierarchy1.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -54,9 +54,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { PlanetCheatSheet.class }; } } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdClassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -30,7 +30,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Tower.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/IdTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -275,9 +275,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Ball.class, Shoe.class, Store.class, Department.class, Dog.class, Computer.class, Home.class, Phone.class, Tree.class, FirTree.class, Footballer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -56,9 +56,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] {}; } } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -54,9 +54,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { PlanetCheatSheet.class }; } } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdClassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -31,7 +31,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Tower.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/IdTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -282,9 +282,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Ball.class, Shoe.class, Store.class, Department.class, Dog.class, Computer.class, Home.class, Phone.class, Tree.class, FirTree.class, Footballer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -56,9 +56,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] {}; } } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/identifiercollection/IdentifierCollectionTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -36,7 +36,7 @@ tx.rollback(); s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Passport.class, Stamp.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/IdManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -60,7 +60,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Store.class, Customer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -12,7 +12,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { B.class, C.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -11,7 +11,7 @@ //test through deployment } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Acces.class, Droitacces.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -150,9 +150,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Country.class, State.class}; } } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/IndexedCollectionTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -10,7 +10,7 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.HSQLDialect; -import org.hibernate.test.annotations.RequiresDialect; +import org.hibernate.junit.RequiresDialect; import org.hibernate.test.annotations.TestCase; /** @@ -523,7 +523,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Wardrobe.class, Drawer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/indexcoll/MapKeyTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -31,7 +31,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { GenerationUser.class, GenerationGroup.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/SubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -149,9 +149,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ A320b.class, //subclasses should be properly reordered Plane.class, Deleted: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -1,33 +0,0 @@ -//$Id$ -package org.hibernate.test.annotations.inheritance.joined; - -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.test.annotations.TestCase; - -/** - * @author Emmanuel Bernard - */ -public class JoinedSubclassAndSecondaryTable extends TestCase { - - public void testSecondaryTableAndJoined() throws Exception { - Session s = openSession(); - Transaction tx = s.beginTransaction(); - SwimmingPool sp = new SwimmingPool(); - sp.setAddress( "Park Avenue" ); - s.persist( sp ); - tx.rollback(); - s.close(); - } - - /** - * @see org.hibernate.test.annotations.TestCase#getMappings() - */ - protected Class[] getMappings() { - return new Class[]{ - Pool.class, - SwimmingPool.class - }; - } - -} Copied: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java (from rev 19378, annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java) =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java (rev 0) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -0,0 +1,33 @@ +//$Id$ +package org.hibernate.test.annotations.inheritance.joined; + +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.annotations.TestCase; + +/** + * @author Emmanuel Bernard + */ +public class JoinedSubclassAndSecondaryTable extends TestCase { + + public void testSecondaryTableAndJoined() throws Exception { + Session s = openSession(); + Transaction tx = s.beginTransaction(); + SwimmingPool sp = new SwimmingPool(); + sp.setAddress( "Park Avenue" ); + s.persist( sp ); + tx.rollback(); + s.close(); + } + + /** + * @see org.hibernate.test.annotations.TestCase#getMappings() + */ + protected Class[] getAnnotatedClasses() { + return new Class[]{ + Pool.class, + SwimmingPool.class + }; + } + +} Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/joined/JoinedSubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -155,9 +155,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ File.class, Folder.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/mixed/SubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -62,9 +62,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ File.class, Folder.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/inheritance/union/SubclassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -54,9 +54,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ File.class, Folder.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/interfaces/InterfacesTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -11,7 +11,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ ContactImpl.class, UserImpl.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/join/JoinTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -202,9 +202,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Life.class, Death.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/loader/LoaderTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -56,9 +56,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Player.class, Team.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/ImageTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -32,7 +32,7 @@ import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.test.annotations.RequiresDialect; +import org.hibernate.junit.RequiresDialect; import org.hibernate.test.annotations.TestCase; import org.hibernate.util.ArrayHelper; @@ -161,7 +161,7 @@ return new String[] { "org.hibernate.test.annotations.lob" }; } - public Class<?>[] getMappings() { + public Class<?>[] getAnnotatedClasses() { return new Class[] { ImageHolder.class }; } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/LobTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -123,7 +123,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Book.class, CompiledCode.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/lob/TextTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -32,7 +32,7 @@ import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseDialect; -import org.hibernate.test.annotations.RequiresDialect; +import org.hibernate.junit.RequiresDialect; import org.hibernate.test.annotations.TestCase; import org.hibernate.util.ArrayHelper; @@ -45,7 +45,7 @@ public class TextTest extends TestCase { @Override - protected Class<?>[] getMappings() { + protected Class<?>[] getAnnotatedClasses() { return new Class[] { LongStringHolder.class }; } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -642,9 +642,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Friend.class, Employer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneJoinTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -52,7 +52,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { BiggestForest.class, ForestType.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneOnNonPkTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -42,7 +42,7 @@ // } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { //Carz.class, //Lotz.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/ManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -317,9 +317,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected java.lang.Class[] getMappings() { + protected java.lang.Class[] getAnnotatedClasses() { return new java.lang.Class[]{ Deal.class, org.hibernate.test.annotations.manytoone.Customer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -44,7 +44,7 @@ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Item.class, Vendor.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -93,7 +93,7 @@ cfg.setProperty( "hibernate.cache.use_query_cache", "true" ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Citizen.class, State.class, NaturalIdOnManyToOne.class }; } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -107,7 +107,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Citizen.class, State.class, NaturalIdOnManyToOne.class }; } Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/notfound/NotFoundTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -36,7 +36,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Coin.class, Currency.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -13,10 +13,11 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.HSQLDialect; +import org.hibernate.junit.FailureExpected; +import org.hibernate.junit.RequiresDialect; import org.hibernate.test.annotations.Customer; import org.hibernate.test.annotations.Discount; import org.hibernate.test.annotations.Passport; -import org.hibernate.test.annotations.RequiresDialect; import org.hibernate.test.annotations.TestCase; import org.hibernate.test.annotations.Ticket; import org.hibernate.test.annotations.TicketComparator; @@ -404,9 +405,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Troop.class, Soldier.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -43,7 +43,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Order.class, OrderItem.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -242,9 +242,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ PartyAffiliate.class, Party.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/onetoone/hhh4851/HHH4851Test.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -36,7 +36,7 @@ } @Override - protected Class<?>[] getMappings() { + protected Class<?>[] getAnnotatedClasses() { return new Class<?>[] { Hardware.class, DeviceGroupConfig.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/override/AssociationOverrideTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -37,7 +37,7 @@ } } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Location.class, Move.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/persister/PersisterTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -35,9 +35,9 @@ } /** - * @see org.hibernate.test.annotations.TestCase#getMappings() + * @see org.hibernate.test.annotations.TestCase#getAnnotatedClasses() */ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Card.class, Deck.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/polymorphism/PolymorphismTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -28,7 +28,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Car.class, SportCar.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/query/QueryAndSQLTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -350,7 +350,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Plane.class, A320.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/quote/QuoteTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -26,7 +26,7 @@ assertEquals( "User_Role", getCfg().getCollectionMapping( role ).getCollectionTable().getName() ); s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { User.class, Role.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -178,7 +178,7 @@ super( x ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ House.class, Postman.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/strategy/StrategyTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -36,7 +36,7 @@ //cfg.getSessionEventListenerConfig().setAutoFlushEventListener( new EJB3AutoFlushEventListener() ); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Storm.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tableperclass/TablePerClassTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -77,7 +77,7 @@ super( x ); //To change body of overridden methods use File | Settings | File Templates. } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Robot.class, T800.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/target/TargetTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -73,7 +73,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { LuggageImpl.class, Brand.class Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/tuplizer/TuplizerTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -26,7 +26,7 @@ s.getTransaction().rollback(); s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Cuisine.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/type/TypeTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -23,7 +23,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Dvd.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/GeneratedTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -22,7 +22,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Antenna.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/IndexTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -52,7 +52,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ Conductor.class, Vehicule.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/various/VersionTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -33,7 +33,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[] { Conductor.class }; Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -65,7 +65,7 @@ s.close(); } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ CarModel.class, Manufacturer.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -63,7 +63,7 @@ } - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ PrimeMinister.class, Sky.class, Modified: annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java =================================================================== --- annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-05-07 07:10:13 UTC (rev 19398) +++ annotations/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/test/annotations/xml/hbm/HbmWithIdentityTest.java 2010-05-07 07:18:16 UTC (rev 19399) @@ -32,7 +32,7 @@ - protected Class[] getMappings() { + protected Class[] getAnnotatedClasses() { return new Class[]{ ZImpl.class };