Author: ozizka(a)redhat.com Date: 2009-05-19 14:26:30 -0400 (Tue, 19 May 2009) New Revision: 449 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java Log: EAR tests updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-19 17:40:25 UTC (rev 448) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-19 18:26:30 UTC (rev 449) @@ -1126,17 +1126,23 @@ // Check that the old app is deployed. ejtt.deployment.waitActivelyForDeployment(APP_TYPE, DEPLOYABLE_NAME, 3000, 15); + // The deployable with different name shouldn't remain deployed. + ejtt.sleep(2000); // Give AS some time... + assertFalse( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME2, false) ); + } finally { try { - undeployEar( DEPLOYABLE_NAME ); - }catch( Exception ex ){ - log.error("Caught exception when undeploying: "+ex, ex); + // undeployEar( DEPLOYABLE_NAME ); + ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME); + }catch( EmbJoprTestException ex ){ + log.error("Caught exception when undeploying '"+DEPLOYABLE_NAME+"': "+ex); } try { - undeployEar( DEPLOYABLE_NAME2 ); - }catch( Exception ex ){ - log.error("Caught exception when undeploying: "+ex, ex); + //undeployEar( DEPLOYABLE_NAME2 ); + ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME2); + }catch( EmbJoprTestException ex ){ + log.error("Caught expected exception when undeploying '"+DEPLOYABLE_NAME2+"': "+ex); } }