[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment AbstractDeploymentTest.java DeploymentTestSuite.java

[ammulder]

ammulder    2005/07/07 19:15:29

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        AbstractDeploymentTest.java
                        DeploymentTestSuite.java
  Log:

  Better tests
  
  Revision  Changes    Path
  1.6       +16 -2     
openejb/modules/openejb-builder/src/test/org/openejb/deployment/AbstractDeploymentTest.java
  
  Index: AbstractDeploymentTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/AbstractDeploymentTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractDeploymentTest.java       7 Jul 2005 21:37:08 -0000       1.5
  +++ AbstractDeploymentTest.java       7 Jul 2005 23:15:29 -0000       1.6
  @@ -168,6 +168,7 @@
       public void testPKGenCMP() throws Exception {
           ObjectName cmpBeanName = ObjectName.getInstance(DOMAIN_NAME + 
":j2eeType=EntityBean,J2EEServer=" + SERVER_NAME + ",J2EEApplication=" + 
getJ2eeApplicationName() + ",EJBModule=" + getJ2eeModuleName() + 
",name=PKGenCMPEntity");
           assertRunning(getKernel(), cmpBeanName);
  +        assertRunning(getKernel(), new 
ObjectName("geronimo.server:name=CMPPKGenerator"));
   
           Object cmpHome = getKernel().getAttribute(cmpBeanName, "ejbHome");
           assertTrue("Home is not an instance of EJBHome", cmpHome instanceof 
EJBHome);
  @@ -178,7 +179,20 @@
       }
   
       public void testPKGenCMP2() throws Exception {
  -        ObjectName cmpBeanName = ObjectName.getInstance(DOMAIN_NAME + 
":j2eeType=EntityBean,J2EEServer=" + SERVER_NAME + ",J2EEApplication=" + 
getJ2eeApplicationName() + ",EJBModule=" + getJ2eeModuleName() + 
",name=PKGenCMPEntity");
  +        ObjectName cmpBeanName = ObjectName.getInstance(DOMAIN_NAME + 
":j2eeType=EntityBean,J2EEServer=" + SERVER_NAME + ",J2EEApplication=" + 
getJ2eeApplicationName() + ",EJBModule=" + getJ2eeModuleName() + 
",name=PKGenCMPEntity2");
  +        assertRunning(getKernel(), cmpBeanName);
  +        assertRunning(getKernel(), new 
ObjectName("geronimo.server:name=CMPPKGenerator2"));
  +
  +        Object cmpHome = getKernel().getAttribute(cmpBeanName, "ejbHome");
  +        assertTrue("Home is not an instance of EJBHome", cmpHome instanceof 
EJBHome);
  +        Object cmp = cmpHome.getClass().getMethod("create", new 
Class[]{}).invoke(cmpHome, new Object[]{});
  +
  +        cmp.getClass().getMethod("setFirstName", new 
Class[]{String.class}).invoke(cmp, new Object[]{"MyFistName"});
  +        assertEquals("MyFistName", cmp.getClass().getMethod("getFirstName", 
null).invoke(cmp, null));
  +    }
  +
  +    public void testPKGenCMP3() throws Exception {
  +        ObjectName cmpBeanName = ObjectName.getInstance(DOMAIN_NAME + 
":j2eeType=EntityBean,J2EEServer=" + SERVER_NAME + ",J2EEApplication=" + 
getJ2eeApplicationName() + ",EJBModule=" + getJ2eeModuleName() + 
",name=PKGenCMPEntity3");
           assertRunning(getKernel(), cmpBeanName);
   
           Object cmpHome = getKernel().getAttribute(cmpBeanName, "ejbHome");
  
  
  
  1.8       +5 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java
  
  Index: DeploymentTestSuite.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DeploymentTestSuite.java  7 Jul 2005 21:37:08 -0000       1.7
  +++ DeploymentTestSuite.java  7 Jul 2005 23:15:29 -0000       1.8
  @@ -215,8 +215,11 @@
                   statement = connection.createStatement();
                   statement.execute("CREATE TABLE SIMPLECMP(ID INTEGER, 
FIRSTNAME VARCHAR(50), LASTNAME VARCHAR(50))");
                   statement.execute("CREATE TABLE PKGENCMP(ID INTEGER, 
FIRSTNAME VARCHAR(50), LASTNAME VARCHAR(50))");
  -                statement.execute("CREATE TABLE PKGENCMP_SEQ(NAME 
VARCHAR(50), VALUE INTEGER)");
                   statement.execute("CREATE TABLE PKGENCMP2(ID INTEGER, 
FIRSTNAME VARCHAR(50), LASTNAME VARCHAR(50))");
  +                statement.execute("CREATE TABLE PKGENCMP3(ID INTEGER, 
FIRSTNAME VARCHAR(50), LASTNAME VARCHAR(50))");
  +                statement.execute("CREATE TABLE PKGENCMP_SEQ(NAME 
VARCHAR(50), VALUE INTEGER)");
  +                // First two sequence rows initialized by OpenEJB wrappers 
around PK generators
  +                statement.execute("INSERT INTO PKGENCMP_SEQ 
VALUES('PKGENCMP3', 100)");
               } finally {
                   JDBCUtil.close(statement);
                   JDBCUtil.close(connection);