Author: rob.stryker(a)jboss.com Date: 2009-11-13 16:18:33 -0500 (Fri, 13 Nov 2009) New Revision: 18686 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java Log: fixing a few tests Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2009-11-13 21:04:54 UTC (rev 18685) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/AbstractDeploymentTest.java 2009-11-13 21:18:33 UTC (rev 18686) @@ -47,7 +47,9 @@ try { this.sourceProjectName = projectNames; this.testProperties = testProperties; - File f = getFileLocation("/testOutputs"); + File to = getFileLocation("/testOutputs"); + File f = new File(to, "inner"); + f.mkdirs(); File fDeploy = new File(f, "1"); File fTmpDeploy = new File(f, "2"); fDeploy.mkdir(); @@ -182,7 +184,8 @@ provider[i].dispose(); cleanFolder(getProjectLocation("TempProject").getAbsolutePath()); - cleanFolder(getFileLocation("testOutputs")); + FileUtil.safeDelete(new File( + getFileLocation("testOutputs"), "inner")); runtime.delete(); server.delete(); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java 2009-11-13 21:04:54 UTC (rev 18685) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/JBIDE2512aTest.java 2009-11-13 21:18:33 UTC (rev 18686) @@ -43,12 +43,7 @@ File shouldExist = new File(libFolder, "EJB3WithDescriptor.jar"); // Expected to fail currently so wrap - try { - assertTrue(shouldExist.exists()); - assertFalse(shouldNotExist.exists()); - } catch( AssertionFailedError afe ) { - return; - } - assertTrue(false); + assertTrue(shouldExist.exists()); + assertFalse(shouldNotExist.exists()); } }