[Hibernate-commits] Hibernate Code SVN: r10054 - trunk/Hibernate3/test/org/hibernate/test/sql

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-06-27 17:12:17 -0400 (Tue, 27 Jun 2006)
New Revision: 10054

Modified:
   trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java
Log:
fixed arguable test

Modified: trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java
===================================================================
--- trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java	2006-06-26 23:20:32 UTC (rev 10053)
+++ trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java	2006-06-27 21:12:17 UTC (rev 10054)
@@ -493,6 +493,16 @@
 
 		s = openSession();
 		t = s.beginTransaction();
+		s.delete(emp2);
+
+		s.delete(jboss);
+		s.delete(gavin);
+		s.delete(ifa);
+		t.commit();
+		s.close();
+
+		s = openSession();
+		t = s.beginTransaction();
 		Dimension dim = new Dimension( 3, Integer.MAX_VALUE );
 		s.save( dim );
 //		s.flush();
@@ -503,16 +513,6 @@
 
 		s = openSession();
 		t = s.beginTransaction();
-		s.delete(emp2);
-
-		s.delete(jboss);
-		s.delete(gavin);
-		s.delete(ifa);
-		t.commit();
-		s.close();
-
-		s = openSession();
-		t = s.beginTransaction();
 		SpaceShip enterprise = new SpaceShip();
 		enterprise.setModel( "USS" );
 		enterprise.setName( "Entreprise" );
@@ -524,8 +524,8 @@
 		Object[] result = (Object[]) s.getNamedQuery( "spaceship" ).uniqueResult();
 		enterprise = (SpaceShip) result[0];
 		assertTrue(50d == enterprise.getSpeed() );
-		assertTrue( 450d == ( (BigInteger) result[1] ).doubleValue() );
-		assertTrue( 4500d == ( (BigDecimal) result[2] ).doubleValue() );
+		assertTrue( 450d == extractDoubleValue( result[1] ) );
+		assertTrue( 4500d == extractDoubleValue( result[2] ) );
 		s.delete( dim );
 		t.commit();
 		s.close();
@@ -542,8 +542,18 @@
 
 	}
 
+	private double extractDoubleValue(Object value) {
+		if ( value instanceof BigInteger ) {
+			return ( ( BigInteger ) value ).doubleValue();
+		}
+		else if ( value instanceof BigDecimal ) {
+			return ( ( BigDecimal ) value ).doubleValue();
+		}
+		else {
+			return Double.valueOf( value.toString() ).doubleValue();
+		}
+	}
 
-
 	public static Test suite() {
 		return new TestSuite(GeneralTest.class);
 	}