[jboss-cvs] jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test ...

[Norman Richards]

  User: nrichards
  Date: 07/12/08 00:45:51

  Modified:    examples/dvdstore/src/com/jboss/dvd/seam/test 
                        ProductUnitTest.java
  Log:
  JBSEAM-2351
  
  Revision  Changes    Path
  1.4       +58 -45    jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/ProductUnitTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProductUnitTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/test/ProductUnitTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ProductUnitTest.java	2 Nov 2006 01:09:41 -0000	1.3
  +++ ProductUnitTest.java	8 Dec 2007 05:45:51 -0000	1.4
  @@ -19,57 +19,70 @@
   public class ProductUnitTest 
       extends SeamTest
   {   
  -    EntityManager em() {
  -        EntityManagerFactory emf = Persistence.createEntityManagerFactory("dvdDatabase");
  -        EntityManager        em  = emf.createEntityManager();
  -        assertNotNull("entity manager", em);
  -        assertTrue("entity manager open", em.isOpen());
  -        return em;
  -    }
  -
  -
       @Test
       public void testRequiredAttributes()
           throws Exception
       {
  +        new ComponentTest() {
  +
  +            @Override
  +            protected void testComponents()
  +                throws Exception 
  +            {
           Product p = new Product();
   
  -        EntityManager em = em();
  +                EntityManager em = (EntityManager) getValue("#{entityManager}");
           try {
               em.persist(p);
               fail("empty product persisted");
           } catch (PersistenceException e) {
               // good
  -        } finally {
  -            em.close();
           }
       }
  +        }.run();
  +    }
   
       @Test 
  -    public void testCreateDelete() {
  -        EntityManager em = em();
  -
  -        Product p = new Product();
  +     public void testCreateDelete() 
  +         throws Exception 
  +     {
  +         final Product p = new Product();
           p.setTitle("test");
   
  -        em.getTransaction().begin();
  +         new FacesRequest() {
  +            protected void invokeApplication()
  +            {
  +                EntityManager em = (EntityManager) getValue("#{entityManager}");                
           em.persist(p);
  -        em.getTransaction().commit();
  +            }
  +            
  +           
  +         }.run();
  +         
  +         new FacesRequest() {
  +             protected void invokeApplication()
  +             { 
  +                 EntityManager em = (EntityManager) getValue("#{entityManager}");
  +                 Product found = em.find(Product.class ,p.getProductId());
  +                 assertNotNull("find by id", found);
  +                 assertEquals("id", p.getProductId(), found.getProductId());
  +                 assertEquals("title", "test", found.getTitle());
   
  -        long id = p.getProductId();
  -        assertTrue("product id set", id != 0);
  +                 em.remove(found);             
  +             }
  +          }.run();
  +         
  +          new FacesRequest() {
  +              protected void invokeApplication()
  +              { 
  +                  EntityManager em = (EntityManager) getValue("#{entityManager}");
  +                  Product found = em.find(Product.class ,p.getProductId());
  +
  +                  assertNull("deleted product", found);             
  +              }
  +           }.run();
           
  -        p = em.find(Product.class ,id);
  -        assertNotNull("find by id", p);
  -        assertEquals("id", id, p.getProductId());
  -        assertEquals("title", "test", p.getTitle());
  -
  -        em.getTransaction().begin();
  -        em.remove(p);
  -        em.getTransaction().commit();
           
  -        p = em.find(Product.class, id);
  -        assertNull("deleted product", p);
       }
       
   }