Author: ste...@jb... Date: 2006-03-14 19:21:49 -0500 (Tue, 14 Mar 2006) New Revision: 9621 Added: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java Removed: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/CompositeIdTest.java branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/PropertyRefTest.java Modified: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java Log: HHH-535 : AllTests Modified: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java =================================================================== --- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java 2006-03-15 00:21:05 UTC (rev 9620) +++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/AllTests.java 2006-03-15 00:21:49 UTC (rev 9621) @@ -126,6 +126,8 @@ import org.hibernate.test.version.db.DbVersionTest; import org.hibernate.test.version.sybase.SybaseTimestampVersioningTest; import org.hibernate.test.where.WhereTest; +import org.hibernate.test.abstractembeddedcomponents.propertyref.AbstractComponentPropertyRefTest; +import org.hibernate.test.abstractembeddedcomponents.cid.AbstractCompositeIdTest; import org.hibernate.dialect.Dialect; /** @@ -327,6 +329,9 @@ suite.addTest( OracleGeneratedKeysTest.suite() ); suite.addTest( InterceptorDynamicEntityTest.suite() ); suite.addTest( TuplizerDynamicEntityTest.suite() ); + suite.addTest( AbstractComponentPropertyRefTest.suite() ); + suite.addTest( AbstractCompositeIdTest.suite() ); + return filter( suite ); //return suite; } Copied: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java (from rev 9617, branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/CompositeIdTest.java) =================================================================== --- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/CompositeIdTest.java 2006-03-14 23:47:37 UTC (rev 9617) +++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java 2006-03-15 00:21:49 UTC (rev 9621) @@ -0,0 +1,43 @@ +package org.hibernate.test.abstractembeddedcomponents.cid; + +import org.hibernate.test.TestCase; +import org.hibernate.Session; +import org.hibernate.Transaction; +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author Steve Ebersole + */ +public class AbstractCompositeIdTest extends TestCase { + public AbstractCompositeIdTest(String x) { + super( x ); + } + + public static Test suite() { + return new TestSuite( AbstractCompositeIdTest.class ); + } + + protected String[] getMappings() { + return new String[] { "abstractembeddedcomponents/cid/Mappings.hbm.xml" }; + } + + public void testEmbeddedCompositeIdentifierOnAbstractClass() { + MyInterfaceImpl myInterface = new MyInterfaceImpl(); + myInterface.setKey1( "key1" ); + myInterface.setKey2( "key2" ); + myInterface.setName( "test" ); + + Session s = openSession(); + Transaction t = s.beginTransaction(); + s.save( myInterface ); + s.flush(); + + s.createQuery( "from MyInterface" ).list(); + + s.delete( myInterface ); + t.commit(); + s.close(); + + } +} Deleted: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/CompositeIdTest.java =================================================================== --- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/CompositeIdTest.java 2006-03-15 00:21:05 UTC (rev 9620) +++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/cid/CompositeIdTest.java 2006-03-15 00:21:49 UTC (rev 9621) @@ -1,37 +0,0 @@ -package org.hibernate.test.abstractembeddedcomponents.cid; - -import org.hibernate.test.TestCase; -import org.hibernate.Session; -import org.hibernate.Transaction; - -/** - * @author Steve Ebersole - */ -public class CompositeIdTest extends TestCase { - public CompositeIdTest(String x) { - super( x ); - } - - protected String[] getMappings() { - return new String[] { "abstractembeddedcomponents/cid/Mappings.hbm.xml" }; - } - - public void testEmbeddedCompositeIdentifierOnAbstractClass() { - MyInterfaceImpl myInterface = new MyInterfaceImpl(); - myInterface.setKey1( "key1" ); - myInterface.setKey2( "key2" ); - myInterface.setName( "test" ); - - Session s = openSession(); - Transaction t = s.beginTransaction(); - s.save( myInterface ); - s.flush(); - - s.createQuery( "from MyInterface" ).list(); - - s.delete( myInterface ); - t.commit(); - s.close(); - - } -} Copied: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java (from rev 9617, branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/PropertyRefTest.java) =================================================================== --- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/PropertyRefTest.java 2006-03-14 23:47:37 UTC (rev 9617) +++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java 2006-03-15 00:21:49 UTC (rev 9621) @@ -0,0 +1,53 @@ +package org.hibernate.test.abstractembeddedcomponents.propertyref; + +import org.hibernate.test.TestCase; +import org.hibernate.Session; +import org.hibernate.Transaction; +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * Test of property-refs pointing to abstract embedded components; i.e. + * a mapping properties element (which is internally handled as an embedded + * component) defined on an abstract class or interface which is a target of + * a property-ref mapping. + * + * @author Steve Ebersole + */ +public class AbstractComponentPropertyRefTest extends TestCase { + public AbstractComponentPropertyRefTest(String x) { + super( x ); + } + + public static Test suite() { + return new TestSuite( AbstractComponentPropertyRefTest.class ); + } + + protected String[] getMappings() { + return new String[] { "abstractembeddedcomponents/propertyref/Mappings.hbm.xml" }; + } + + public void testPropertiesRefCascades() { + Session session = openSession(); + Transaction trans = session.beginTransaction(); + ServerImpl server = new ServerImpl(); + session.save( server ); + AddressImpl address = new AddressImpl(); + server.setAddress( address ); + address.setServer( server ); + session.flush(); + session.createQuery( "from Server s join fetch s.address" ).list(); + trans.commit(); + session.close(); + + assertNotNull( server.getId() ); + assertNotNull( address.getId() ); + + session = openSession(); + trans = session.beginTransaction(); + session.delete( address ); + session.delete( server ); + trans.commit(); + session.close(); + } +} Deleted: branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/PropertyRefTest.java =================================================================== --- branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/PropertyRefTest.java 2006-03-15 00:21:05 UTC (rev 9620) +++ branches/Branch_3_1/Hibernate3/test/org/hibernate/test/abstractembeddedcomponents/propertyref/PropertyRefTest.java 2006-03-15 00:21:49 UTC (rev 9621) @@ -1,47 +0,0 @@ -package org.hibernate.test.abstractembeddedcomponents.propertyref; - -import org.hibernate.test.TestCase; -import org.hibernate.Session; -import org.hibernate.Transaction; - -/** - * Test of property-refs pointing to abstract embedded components; i.e. - * a mapping properties element (which is internally handled as an embedded - * component) defined on an abstract class or interface which is a target of - * a property-ref mapping. - * - * @author Steve Ebersole - */ -public class PropertyRefTest extends TestCase { - public PropertyRefTest(String x) { - super( x ); - } - - protected String[] getMappings() { - return new String[] { "abstractembeddedcomponents/propertyref/Mappings.hbm.xml" }; - } - - public void testPropertiesRefCascades() { - Session session = openSession(); - Transaction trans = session.beginTransaction(); - ServerImpl server = new ServerImpl(); - session.save( server ); - AddressImpl address = new AddressImpl(); - server.setAddress( address ); - address.setServer( server ); - session.flush(); - session.createQuery( "from Server s join fetch s.address" ).list(); - trans.commit(); - session.close(); - - assertNotNull( server.getId() ); - assertNotNull( address.getId() ); - - session = openSession(); - trans = session.beginTransaction(); - session.delete( address ); - session.delete( server ); - trans.commit(); - session.close(); - } -} |