These changes removed an existing test case (testListTargets). Please put it back or explain why it was removed.
Jarek On Mon, Jun 23, 2008 at 9:25 AM, <[EMAIL PROTECTED]> wrote: > Author: dwoods > Date: Mon Jun 23 06:25:19 2008 > New Revision: 670561 > > URL: http://svn.apache.org/viewvc?rev=670561&view=rev > Log: > GERONIMO-4149 Minor updates to commands-testsuite > > Modified: > > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java > > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java > > Modified: > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java > URL: > http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java?rev=670561&r1=670560&r2=670561&view=diff > ============================================================================== > --- > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java > (original) > +++ > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerOfflineTest.java > Mon Jun 23 06:25:19 2008 > @@ -41,5 +41,12 @@ > execute(CommandTestSupport.DEPLOY, cmd, null, baos); > return baos.toString(); > } > - > + > + protected String getDefaultStartedModuleName() { > + return "org.apache.geronimo.configs/openejb-deployer"; > + } > + > + protected String getDefaultStoppedModuleName() { > + return "org.apache.geronimo.framework/online-deployer"; > + } > } > > Modified: > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java > URL: > http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java?rev=670561&r1=670560&r2=670561&view=diff > ============================================================================== > --- > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java > (original) > +++ > geronimo/server/branches/2.1/testsuite/commands-testsuite/deploy/src/test/java/org/apache/geronimo/testsuite/deploy/DeployerTest.java > Mon Jun 23 06:25:19 2008 > @@ -47,8 +47,8 @@ > String[] args = new String[]{ "list-modules" }; > > String output = execute(args); > - > - if (output.indexOf("org.apache.geronimo.configs/j2ee-deployer") < 0) > { > + > + if (output.indexOf(getDefaultStartedModuleName()) < 0) { > Assert.fail("list-modules failed : " + output); > } > } > @@ -59,7 +59,10 @@ > > String output = execute(args); > > - if (output.indexOf("org.apache.geronimo.configs/j2ee-deployer") < 0) > { > + if (output.indexOf(getDefaultStartedModuleName()) < 0) { > + Assert.fail("list-modules failed : " + output); > + } > + if (output.indexOf(getDefaultStoppedModuleName()) > 0) { > Assert.fail("list-modules failed : " + output); > } > } > @@ -70,20 +73,20 @@ > > String output = execute(args); > > - if (output.indexOf("org.apache.geronimo.configs/j2ee-deployer") > 0) > { > - Assert.fail("list-modules failed : " + output); > + if (output.indexOf(getDefaultStartedModuleName()) > 0) { > + Assert.fail("deploy/list-modules failed : " + output); > + } > + if (output.indexOf(getDefaultStoppedModuleName()) < 0) { > + Assert.fail("deploy/list-modules failed : " + output); > } > } > > - @Test > - public void testListTargets() throws Exception { > - String[] args = new String[]{ "list-targets" }; > - > - String output = execute(args); > - > - if (output.indexOf("j2eeType=ConfigurationStore,name=Local") < 0) { > - Assert.fail("deploy/list-targets failed : " + output); > - } > + protected String getDefaultStartedModuleName() { > + return "org.apache.geronimo.configs/activemq-broker"; > } > - > + > + protected String getDefaultStoppedModuleName() { > + return "org.apache.geronimo.configs/client-corba-yoko"; > + } > + > } > > >
