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

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

Revision: 4075
          http://openutils.svn.sourceforge.net/openutils/?rev=4075&view=rev
Author:   gcatania
Date:     2012-06-29 14:26:07 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
cleanup unit tests

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

Added Paths:
-----------
    trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java

Added: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	                        (rev 0)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java	2012-06-29 14:26:07 UTC (rev 4075)
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) Energeya LLC.  All rights reserved. http://www.energeya.com
+ */
+package it.openutils.hibernate.test;
+
+import it.openutils.hibernate.test.model.Address;
+import it.openutils.hibernate.test.model.Car;
+import it.openutils.hibernate.test.model.CarMaker;
+import it.openutils.hibernate.test.model.CarModel;
+import it.openutils.hibernate.test.model.CurrencyAmount;
+import it.openutils.hibernate.test.model.Designer;
+import it.openutils.hibernate.test.model.FullName;
+import it.openutils.hibernate.test.model.Owner;
+import it.openutils.hibernate.test.model.Person;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+
+/**
+ * @author gcatania
+ * @version $Id$
+ */
+public final class EntityBuilder
+{
+
+    private EntityBuilder()
+    {
+    }
+
+    public static Person alice()
+    {
+        FullName fullName = new FullName("Alice", "McBeal");
+        Calendar birthDate = new GregorianCalendar(1970, Calendar.MARCH, 7);
+        Address address = new Address("Long road", 15, "Smalltown", "MI", 14352);
+        Person p = new Person();
+        p.setName(fullName);
+        p.setBirthDate(birthDate);
+        p.setFiscalAddress(address);
+        p.setCurrentAddress(address);
+        return p;
+    }
+
+    public static Owner bob()
+    {
+        FullName fullName = new FullName("Bob", "Kelso");
+        Calendar birthDate = new GregorianCalendar(1950, Calendar.MARCH, 7);
+        Address address = new Address("Sacred Heart Lane", 3, "Smalltown", "CA", 11243);
+        Owner o = new Owner();
+        o.setName(fullName);
+        o.setBirthDate(birthDate);
+        o.setFiscalAddress(address);
+        o.setCurrentAddress(address);
+        return o;
+    }
+
+    public static Owner chuck()
+    {
+        FullName fullName = new FullName("Chuck", "Palahniuk");
+        Calendar birthDate = new GregorianCalendar(1962, Calendar.FEBRUARY, 21);
+        Address address = new Address("Awesome Street", 2, "Pasco", "WA", 13121);
+        Owner p = new Owner();
+        p.setName(fullName);
+        p.setBirthDate(birthDate);
+        p.setFiscalAddress(address);
+        p.setCurrentAddress(address);
+        return p;
+    }
+
+    public static CarMaker toyota()
+    {
+        CarMaker toyota = new CarMaker();
+        toyota.setCode("TYT");
+        toyota.setName("Toyota");
+        toyota.setCapitalization(new CurrencyAmount(12000, "YEN"));
+        return toyota;
+    }
+
+    public static CarMaker fiat()
+    {
+        CarMaker fiat = new CarMaker();
+        fiat.setCode("FIA");
+        fiat.setName("Fabbrica Italiana Automobili Torino");
+        fiat.setCapitalization(new CurrencyAmount(80000, "EUR"));
+        return fiat;
+    }
+
+    public static CarModel prius(CarMaker toyota)
+    {
+        CarModel prius = new CarModel();
+        prius.setName("Prius");
+        prius.setMake(toyota);
+        prius.setYear(Integer.valueOf(2008));
+
+        List<CarModel> toyotaModels = toyota.getModels();
+        if (toyotaModels == null)
+        {
+            toyotaModels = new ArrayList<CarModel>();
+        }
+        toyotaModels.add(prius);
+        toyota.setModels(toyotaModels);
+        return prius;
+    }
+
+    public static Designer priusDesigner(CarModel prius)
+    {
+        FullName fullName = new FullName("Ken", "Shiro");
+        Calendar birthDate = new GregorianCalendar(1981, Calendar.OCTOBER, 16);
+        Address address = new Address("Khan avenue", 6, "Nagato", "TK", 99867);
+        Designer p = new Designer();
+        p.setName(fullName);
+        p.setBirthDate(birthDate);
+        p.setFiscalAddress(address);
+        p.setCurrentAddress(address);
+        p.setDepartment("design");
+        p.setEmployer(prius.getMake());
+        p.setDesignedModels(Collections.singleton(prius));
+        p.setGrossAnnualSalary(new CurrencyAmount(60000, "YEN"));
+        p.setHipsterFactor(97);
+        return p;
+    }
+
+    public static 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;
+    }
+
+    public static 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;
+    }
+
+}


Property changes on: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/EntityBuilder.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java
===================================================================
--- trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-06-29 13:17:38 UTC (rev 4074)
+++ trunk/openutils-bshd5/src/test/java/it/openutils/hibernate/test/HibernateDAOPersistenceTest.java	2012-06-29 14:26:07 UTC (rev 4075)
@@ -25,6 +25,15 @@
 
 package it.openutils.hibernate.test;
 
+import static it.openutils.hibernate.test.EntityBuilder.alice;
+import static it.openutils.hibernate.test.EntityBuilder.bob;
+import static it.openutils.hibernate.test.EntityBuilder.bobsPrius;
+import static it.openutils.hibernate.test.EntityBuilder.chuck;
+import static it.openutils.hibernate.test.EntityBuilder.chucksPrius;
+import static it.openutils.hibernate.test.EntityBuilder.fiat;
+import static it.openutils.hibernate.test.EntityBuilder.prius;
+import static it.openutils.hibernate.test.EntityBuilder.priusDesigner;
+import static it.openutils.hibernate.test.EntityBuilder.toyota;
 import it.openutils.hibernate.test.dao.CarDAO;
 import it.openutils.hibernate.test.dao.CarMakerDAO;
 import it.openutils.hibernate.test.dao.PersonDAO;
@@ -40,11 +49,8 @@
 import it.openutils.hibernate.test.model.Person;
 import it.openutils.hibernate.test.model.Sticker;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Collections;
-import java.util.GregorianCalendar;
 import java.util.List;
 
 import org.hibernate.criterion.Example;
@@ -80,120 +86,6 @@
     @Autowired
     private StickerDAO stickerDAO;
 
-    private static Person alice()
-    {
-        FullName fullName = new FullName("Alice", "McBeal");
-        Calendar birthDate = new GregorianCalendar(1970, Calendar.MARCH, 7);
-        Address address = new Address("Long road", 15, "Smalltown", "MI", 14352);
-        Person p = new Person();
-        p.setName(fullName);
-        p.setBirthDate(birthDate);
-        p.setFiscalAddress(address);
-        p.setCurrentAddress(address);
-        return p;
-    }
-
-    private static Owner bob()
-    {
-        FullName fullName = new FullName("Bob", "Kelso");
-        Calendar birthDate = new GregorianCalendar(1950, Calendar.MARCH, 7);
-        Address address = new Address("Sacred Heart Lane", 3, "Smalltown", "CA", 11243);
-        Owner o = new Owner();
-        o.setName(fullName);
-        o.setBirthDate(birthDate);
-        o.setFiscalAddress(address);
-        o.setCurrentAddress(address);
-        return o;
-    }
-
-    private static Owner chuck()
-    {
-        FullName fullName = new FullName("Chuck", "Palahniuk");
-        Calendar birthDate = new GregorianCalendar(1962, Calendar.FEBRUARY, 21);
-        Address address = new Address("Awesome Street", 2, "Pasco", "WA", 13121);
-        Owner p = new Owner();
-        p.setName(fullName);
-        p.setBirthDate(birthDate);
-        p.setFiscalAddress(address);
-        p.setCurrentAddress(address);
-        return p;
-    }
-
-    private static CarMaker toyota()
-    {
-        CarMaker toyota = new CarMaker();
-        toyota.setCode("TYT");
-        toyota.setName("Toyota");
-        toyota.setCapitalization(new CurrencyAmount(12000, "YEN"));
-        return toyota;
-    }
-
-    private static CarMaker fiat()
-    {
-        CarMaker fiat = new CarMaker();
-        fiat.setCode("FIA");
-        fiat.setName("Fabbrica Italiana Automobili Torino");
-        fiat.setCapitalization(new CurrencyAmount(80000, "EUR"));
-        return fiat;
-    }
-
-    private static CarModel prius(CarMaker toyota)
-    {
-        CarModel prius = new CarModel();
-        prius.setName("Prius");
-        prius.setMake(toyota);
-        prius.setYear(Integer.valueOf(2008));
-
-        List<CarModel> toyotaModels = toyota.getModels();
-        if (toyotaModels == null)
-        {
-            toyotaModels = new ArrayList<CarModel>();
-        }
-        toyotaModels.add(prius);
-        toyota.setModels(toyotaModels);
-        return prius;
-    }
-
-    private static Designer priusDesigner(CarModel prius)
-    {
-        FullName fullName = new FullName("Ken", "Shiro");
-        Calendar birthDate = new GregorianCalendar(1981, Calendar.OCTOBER, 16);
-        Address address = new Address("Khan avenue", 6, "Nagato", "TK", 99867);
-        Designer p = new Designer();
-        p.setName(fullName);
-        p.setBirthDate(birthDate);
-        p.setFiscalAddress(address);
-        p.setCurrentAddress(address);
-        p.setDepartment("design");
-        p.setEmployer(prius.getMake());
-        p.setDesignedModels(Collections.singleton(prius));
-        p.setGrossAnnualSalary(new CurrencyAmount(60000, "YEN"));
-        p.setHipsterFactor(97);
-        return p;
-    }
-
-    private static 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 static 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.
      */

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