cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo TestUserInfoManager.java

[dlestrat]

dlestrat    2004/05/17 17:43:46

  Modified:    portal/src/test/org/apache/jetspeed/userinfo
                        TestUserInfoManager.java
  Log:
  Test clean up.
  
  Revision  Changes    Path
  1.3       +27 -8     
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
  
  Index: TestUserInfoManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestUserInfoManager.java  16 May 2004 23:56:03 -0000      1.2
  +++ TestUserInfoManager.java  18 May 2004 00:43:46 -0000      1.3
  @@ -26,9 +26,7 @@
   
   import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
   import org.apache.jetspeed.components.ComponentAwareTestSuite;
  -import org.apache.jetspeed.components.persistence.store.Filter;
   import org.apache.jetspeed.components.persistence.store.PersistenceStore;
  -import org.apache.jetspeed.components.persistence.store.impl.LockFailedException;
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
   import org.apache.jetspeed.mockobjects.request.MockRequestContext;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
  @@ -132,9 +130,20 @@
               
PortletDescriptorUtilities.loadPortletDescriptor("./test/testdata/deploy/portlet.xml", 
"unit-test");
           assertNotNull("App is null", app);
   
  -        store.getTransaction().begin();
  -        store.makePersistent(app);
  -        store.getTransaction().commit();
  +        // persist the app
  +        try
  +        {
  +            store.getTransaction().begin();
  +            registry.registerPortletApplication(app);
  +            store.getTransaction().commit();
  +        }
  +        catch (Exception e)
  +        {
  +            String msg =
  +                "Unable to register portlet application, " + app.getName() + ", 
through the portlet registry: " + e.toString();
  +            store.getTransaction().rollback();
  +            throw new Exception(msg, e);
  +        }
   
           RequestContext request = initRequestContext("anon");
   
  @@ -151,9 +160,19 @@
           assertEquals("should contain user.name.family", "Dudley", (String) 
userInfo.get("user.name.family"));
           assertNull("should not contain user.home-info.online.email", 
userInfo.get("user.home-info.online.email"));
   
  -        store.getTransaction().begin();
  -        store.deletePersistent(app);
  -        store.getTransaction().commit();
  +        // remove the app
  +        try
  +        {
  +            store.getTransaction().begin();
  +            registry.removeApplication(app);
  +            store.getTransaction().commit();
  +        }
  +        catch (Exception e)
  +        {
  +            String msg =
  +                "Unable to remove portlet application, " + app.getName() + ", 
through the portlet registry: " + e.toString();
  +            throw new Exception(msg, e);
  +        }
                   
           destroyUser();
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]