Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r9914 - in trunk/Hibernate3/test/org/hibernate/test: . compositeelement comppropertyref cuk dom4j formulajoin id joinfetch onetomany onetoone/joined subclassfilter ternary typedonetoone typeparameters unionsubclass
Author: max...@jb...
Date: 2006-05-09 05:37:18 -0400 (Tue, 09 May 2006)
New Revision: 9914
Modified:
trunk/Hibernate3/test/org/hibernate/test/TestCase.java
trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java
trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java
trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java
trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java
trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java
trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java
trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java
trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java
trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java
trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java
trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java
trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java
trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java
trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java
trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java
Log:
todays share of test data clean up
Modified: trunk/Hibernate3/test/org/hibernate/test/TestCase.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/TestCase.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/TestCase.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -3,15 +3,21 @@
import java.sql.Blob;
import java.sql.Clob;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
+import junit.framework.AssertionFailedError;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
+import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.DB2Dialect;
@@ -29,8 +35,6 @@
import org.hibernate.mapping.Property;
import org.hibernate.mapping.SimpleValue;
-import junit.framework.AssertionFailedError;
-
public abstract class TestCase extends junit.framework.TestCase {
private static SessionFactory sessions;
@@ -38,7 +42,7 @@
private static Dialect dialect;
private static Class lastTestClass;
private org.hibernate.classic.Session session;
-
+
protected boolean recreateSchema() {
return true;
}
@@ -190,10 +194,36 @@
}
}
- private void assertAllDataRemoved() {
+ protected void assertAllDataRemoved() {
+ if(!recreateSchema()) {
+ return; // no tables were created...
+ }
+
Session tmpSession = openSession();
- assertEquals("Data is left in the database",0, tmpSession.createQuery( "from java.lang.Object" ).list().size());
- tmpSession.close();
+ List list = tmpSession.createQuery( "from java.lang.Object" ).list();
+
+ StringBuffer sb = new StringBuffer();
+ Map items = new HashMap();
+
+ if(!list.isEmpty()) {
+ for (Iterator iter = list.iterator(); iter.hasNext();) {
+ Object element = iter.next();
+ Integer l = (Integer) items.get(tmpSession.getEntityName( element ));
+ if(l==null) {
+ l = new Integer(0);
+ }
+ l = new Integer(l.intValue()+1);
+ items.put(tmpSession.getEntityName( element ), l);
+ System.out.println("Data left: " + element);
+ }
+ try {
+ tmpSession.close();
+ } finally {
+ fail("Data is left in the database: " + items.toString() );
+ }
+ } else {
+ tmpSession.close();
+ }
}
protected boolean dropAfterFailure() {
Modified: trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/compositeelement/CompositeElementTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -47,6 +47,12 @@
p = (Parent) s.createQuery("from Parent p left join fetch p.children").uniqueResult();
t.commit();
s.close();
+
+ s = openSession();
+ t = s.beginTransaction();
+ s.delete(p);
+ t.commit();
+ s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/comppropertyref/ComponentPropertyRefTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -57,6 +57,8 @@
assertEquals( "Gavin", a.getOwner().getIdentity().getName() );
assertTrue( Hibernate.isInitialized( a.getOwner() ) );
+ s.delete( a );
+ s.delete( a.getOwner() );
tx.commit();
s.close();
Modified: trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/cuk/CompositePropertyRefTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -100,6 +100,10 @@
l = s.createQuery("from Person p left join fetch p.address").list();
+ s.clear();
+ ((org.hibernate.classic.Session)s).delete( "from Address" );
+ ((org.hibernate.classic.Session)s).delete( "from Person" );
+ ((org.hibernate.classic.Session)s).delete( "from Account" );
t.commit();
s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/dom4j/Dom4jTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -285,6 +285,7 @@
t = s.beginTransaction();
s.delete( "Account", acct );
s.delete( "Location", loc );
+ s.createQuery( "delete from Account" ).executeUpdate();
t.commit();
s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/formulajoin/FormulaJoinTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -79,6 +79,10 @@
tx = s.beginTransaction();
l = s.createQuery("from Detail d join fetch d.currentMaster.master m join fetch m.detail").list();
assertEquals( l.size(), 2 );
+
+ s.createQuery("delete from Detail").executeUpdate();
+ s.createQuery("delete from Master").executeUpdate();
+
tx.commit();
s.close();
Modified: trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/id/MultipleHiLoPerTableGeneratorTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -43,6 +43,12 @@
assertEquals(i+1, cars[i].getId().intValue());
//assertEquals(i+1, planes[i].getId().intValue());
}
+
+ s = openSession();
+ tx = s.beginTransaction();
+ s.createQuery( "delete from Car" ).executeUpdate();
+ tx.commit();
+ s.close();
}
public void testRollingBack() throws Throwable {
@@ -90,6 +96,12 @@
assertEquals( new Integer(2), radio.getId() );
tx.commit();
s.close();
+
+ s = openSession();
+ tx = s.beginTransaction();
+ s.createQuery( "delete from Radio" ).executeUpdate();
+ tx.commit();
+ s.close();
}
public static Test suite() {
Modified: trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/joinfetch/JoinFetchTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -167,6 +167,7 @@
s.createQuery( "delete from Bid" ).executeUpdate();
s.createQuery( "delete from Comment" ).executeUpdate();
s.createQuery( "delete from Item" ).executeUpdate();
+ s.createQuery( "delete from Category" ).executeUpdate();
t.commit();
s.close();
Modified: trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/onetomany/OneToManyTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -62,6 +62,14 @@
p = (Parent) s.createQuery("from Parent p left join fetch p.children").uniqueResult();
t.commit();
s.close();
+
+ s = openSession();
+ t = s.beginTransaction();
+ s.createQuery("delete from Child").executeUpdate();
+ s.createQuery("delete from Parent").executeUpdate();
+ t.commit();
+ s.close();
+
}
public void testManyToManySize() {
Modified: trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/Address.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -9,4 +9,8 @@
public String street;
public String state;
public String zip;
+
+ public String toString() {
+ return this.getClass() + ":" + street;
+ }
}
Modified: trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/onetoone/joined/OneToOneTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -131,8 +131,12 @@
org = (Org) list.get(1);
assertNotNull(p.address); assertNull(p.mailingAddress);
+ s.clear();
s.delete(p);
-
+ s.delete( p.address );
+ s.delete( org );
+ s.delete( a2 );
+ s.flush();
t.commit();
s.close();
Modified: trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -73,9 +73,16 @@
break;
}
}
-
+
t.commit();
s.close();
+
+ s = openSession();
+ t = s.beginTransaction();
+ s.delete("from Person");
+ t.commit();
+ s.close();
+
}
private void prepareTestData(Session s) {
Modified: trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/ternary/TernaryTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -95,6 +95,7 @@
emp.setManagerBySite( new HashMap() );
s.delete( emp );
}
+ s.delete("from Site");
t.commit();
s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/typedonetoone/TypedOneToOneTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -61,8 +61,21 @@
assertEquals( "30326", cust.getShippingAddress().getZip() );
assertEquals( "BILLING", cust.getBillingAddress().getAddressId().getType() );
assertEquals( "SHIPPING", cust.getShippingAddress().getAddressId().getType() );
+
t.commit();
s.close();
+
+ s = openSession();
+ t = s.beginTransaction();
+ cust.setBillingAddress( null );
+ cust.setShippingAddress( null );
+ s.delete( cust );
+ ((org.hibernate.classic.Session)s).delete("from BillingAddress");
+ ((org.hibernate.classic.Session)s).delete("from ShippingAddress");
+ s.flush();
+ t.commit();
+ s.close();
+
}
public void testCreateQueryNull() {
@@ -83,6 +96,7 @@
cust = (Customer) results.get(0);
assertNull( cust.getShippingAddress() );
assertNull( cust.getBillingAddress() );
+ s.delete(cust);
t.commit();
s.close();
Modified: trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/typeparameters/TypeParameterTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -65,12 +65,13 @@
statement.setInt(1, id.intValue());
ResultSet resultSet = statement.executeQuery();
- TestCase.assertTrue("A row should have been returned", resultSet.next());
- TestCase.assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_ONE") == null);
- TestCase.assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_TWO") == null);
- TestCase.assertEquals("Non-Default value should not be changed", resultSet.getInt("VALUE_THREE"), 5);
- TestCase.assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_FOUR") == null);
+ assertTrue("A row should have been returned", resultSet.next());
+ assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_ONE") == null);
+ assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_TWO") == null);
+ assertEquals("Non-Default value should not be changed", resultSet.getInt("VALUE_THREE"), 5);
+ assertTrue("Default value should have been mapped to null", resultSet.getObject("VALUE_FOUR") == null);
+ deleteData();
t.commit();
s.close();
}
@@ -82,17 +83,18 @@
Transaction t = s.beginTransaction();
Widget obj = (Widget) s.createQuery("from Widget o where o.string = :string").setString("string", "all-normal").uniqueResult();
- TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueOne(), 7);
- TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueTwo(), 8);
- TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueThree(), 9);
- TestCase.assertEquals("Non-Default value incorrectly loaded", obj.getValueFour(), 10);
+ assertEquals("Non-Default value incorrectly loaded", obj.getValueOne(), 7);
+ assertEquals("Non-Default value incorrectly loaded", obj.getValueTwo(), 8);
+ assertEquals("Non-Default value incorrectly loaded", obj.getValueThree(), 9);
+ assertEquals("Non-Default value incorrectly loaded", obj.getValueFour(), 10);
obj = (Widget) s.createQuery("from Widget o where o.string = :string").setString("string", "all-default").uniqueResult();
- TestCase.assertEquals("Default value incorrectly loaded", obj.getValueOne(), 1);
- TestCase.assertEquals("Default value incorrectly loaded", obj.getValueTwo(), 2);
- TestCase.assertEquals("Default value incorrectly loaded", obj.getValueThree(), -1);
- TestCase.assertEquals("Default value incorrectly loaded", obj.getValueFour(), -5);
+ assertEquals("Default value incorrectly loaded", obj.getValueOne(), 1);
+ assertEquals("Default value incorrectly loaded", obj.getValueTwo(), 2);
+ assertEquals("Default value incorrectly loaded", obj.getValueThree(), -1);
+ assertEquals("Default value incorrectly loaded", obj.getValueFour(), -5);
+ deleteData();
t.commit();
s.close();
}
Modified: trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java 2006-05-09 07:40:11 UTC (rev 9913)
+++ trunk/Hibernate3/test/org/hibernate/test/unionsubclass/UnionSubclassTest.java 2006-05-09 09:37:18 UTC (rev 9914)
@@ -351,6 +351,8 @@
x23y4 = (Alien) s.createCriteria(Alien.class).uniqueResult();
s.delete( x23y4.getHive() );
assertTrue( s.createQuery("from Being").list().isEmpty() );
+
+ s.createQuery("delete from Location").executeUpdate();
t.commit();
s.close();
}
|
