weaver      2004/05/27 12:41:36

  Modified:    components/rdbms/src/test/org/apache/jetspeed/components
                        TestRDBMS.java
  Log:
  added some additonal testing
  
  Revision  Changes    Path
  1.6       +24 -0     
jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java
  
  Index: TestRDBMS.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestRDBMS.java    9 Mar 2004 16:18:24 -0000       1.5
  +++ TestRDBMS.java    27 May 2004 19:41:36 -0000      1.6
  @@ -16,12 +16,16 @@
   package org.apache.jetspeed.components;
   import java.sql.Connection;
   
  +import javax.naming.InitialContext;
  +import javax.naming.NamingException;
   import javax.sql.DataSource;
   
   import junit.framework.Test;
   
  +import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent;
   import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent;
   import org.apache.jetspeed.components.datasource.DatasourceComponent;
  +import org.apache.jetspeed.components.jndi.JNDIComponent;
   import org.picocontainer.MutablePicoContainer;
   /**
    * <p>
  @@ -57,6 +61,9 @@
           MutablePicoContainer defaultContainer = 
getComponentManager().getRootContainer();
           DatasourceComponent dsc = (DatasourceComponent) defaultContainer
           .getComponentInstance(DatasourceComponent.class);
  +        InitialContext context = new InitialContext();
  +        //look up from jndi
  +        assertNotNull(context.lookup("java:comp/env/jdbc/jetspeed"));
           assertNotNull(dsc);
           DataSource ds = dsc.getDatasource();
           assertNotNull(ds);
  @@ -64,6 +71,23 @@
           assertNotNull(conn);
           assertFalse(conn.isClosed());
           conn.close();
  +        ((BoundDBCPDatasourceComponent)dsc).stop();
  +        JNDIComponent jndi = 
(JNDIComponent)defaultContainer.getComponentInstance(JNDIComponent.class);
  +        
  +        try
  +        {
  +            context.lookup("java:comp/env/jdbc/jetspeed");
  +            assertNotNull("java:comp/env/jdbc/jetspeed was not unbound", null);
  +        }
  +        catch (NamingException e)
  +        {
  +       
  +        }
  +        
  + 
  +     
       }
  +    
  +   
   
   }
  
  
  

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

Reply via email to