[Openutils-svn] SF.net SVN: openutils:[3728] trunk/openutils-bshd5/src/test/java/it/ openutils/hibernate/test/HibernateDAOTest.java

[<gca...@us...>]

Revision: 3728
          http://openutils.svn.sourceforge.net/openutils/?rev=3728&view=rev
Author:   gcatania
Date:     2011-12-02 15:18:01 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
BSHD-2 improved unit tests

Modified Paths:
--------------
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java	2011-12-02 15:08:08 UTC (rev 3727)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOTest.java	2011-12-02 15:18:01 UTC (rev 3728)
@@ -165,6 +165,28 @@
         return p;
     }
 
+    private Car bobsPrius(Owner bob, CarModel prius)
+    {
+        Car bobsPrius = new Car();
+        bobsPrius.setModel(prius);
+        bobsPrius.setRegistrationDate(new GregorianCalendar(2010, Calendar.OCTOBER, 28));
+        bobsPrius.setMarketValue(new CurrencyAmount(1700, "USD"));
+        bobsPrius.setOwner(bob);
+        bob.setCars(Collections.singleton(bobsPrius));
+        return bobsPrius;
+    }
+
+    private Car chucksPrius(Owner chuck, CarModel prius)
+    {
+        Car chucksPrius = new Car();
+        chucksPrius.setModel(prius);
+        chucksPrius.setRegistrationDate(new GregorianCalendar(2011, Calendar.DECEMBER, 13));
+        chucksPrius.setMarketValue(new CurrencyAmount(5400, "USD"));
+        chucksPrius.setOwner(chuck);
+        chuck.setCars(Collections.singleton(chucksPrius));
+        return chucksPrius;
+    }
+
     /**
      * basic save/evict/get test.
      */
@@ -280,27 +302,17 @@
     @Test
     public void testFindFilteredChild()
     {
-        Owner bob = bob();
         CarMaker toyota = toyota();
         CarModel prius = prius(toyota);
 
-        Car bobsPrius = new Car();
-        bobsPrius.setModel(prius);
-        bobsPrius.setRegistrationDate(new GregorianCalendar(2010, Calendar.OCTOBER, 28));
-        bobsPrius.setMarketValue(new CurrencyAmount(1700, "USD"));
-        bobsPrius.setOwner(bob);
-        bob.setCars(Collections.singleton(bobsPrius));
+        Owner bob = bob();
+        bobsPrius(bob, prius);
+        personDAO.save(bob);
 
         Owner chuck = chuck();
-        Car chucksPrius = new Car();
-        chucksPrius.setModel(prius);
-        chucksPrius.setRegistrationDate(new GregorianCalendar(2011, Calendar.DECEMBER, 13));
-        chucksPrius.setMarketValue(new CurrencyAmount(5400, "USD"));
-        chucksPrius.setOwner(bob);
-        chuck.setCars(Collections.singleton(chucksPrius));
+        chucksPrius(chuck, prius);
+        personDAO.save(chuck);
 
-        personDAO.save(bob);
-        personDAO.save(chuck);
         personDAO.save(priusDesigner(prius));
 
         Car carFilter = new Car();
@@ -359,12 +371,7 @@
         CarMaker toyota = toyota();
         CarModel prius = prius(toyota);
 
-        Car bobsPrius = new Car();
-        bobsPrius.setModel(prius);
-        bobsPrius.setRegistrationDate(new GregorianCalendar(2010, Calendar.OCTOBER, 28));
-        bobsPrius.setMarketValue(new CurrencyAmount(1700, "USD"));
-        bobsPrius.setOwner(bob);
-        bob.setCars(Collections.singleton(bobsPrius));
+        Car bobsPrius = bobsPrius(bob, prius);
         personDAO.save(bob);
         personDAO.save(alice());
         personDAO.save(chuck());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.