Author: adietish Date: 2011-06-06 10:20:58 -0400 (Mon, 06 Jun 2011) New Revision: 31847 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java Log: [JBIDE-9069] fixed asserts in SingleFileZippedDeploymentIntegrationTest#testSingleFolderZippedForAS7 and committed to TRUNK Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 14:12:23 UTC (rev 31846) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-06-06 14:20:58 UTC (rev 31847) @@ -50,7 +50,8 @@ int changed = MockPublishMethod.getChanged().length; int removed = MockPublishMethod.getRemoved().length; assertEquals(2,changed); - assertEquals(1,removed); + // always removing the prior deployment since we could be switching from exploded to war + assertEquals(2,removed); MockPublishMethod.reset(); // make workspace change, repeat @@ -61,7 +62,8 @@ changed = MockPublishMethod.getChanged().length; removed = MockPublishMethod.getRemoved().length; assertEquals(2,changed); - assertEquals(1,removed); + // always removing the prior deployment since we could be switching from exploded to war + assertEquals(2,removed); MockPublishMethod.reset(); server = ServerRuntimeUtils.removeModule(server, mods[0]); @@ -70,7 +72,8 @@ changed = MockPublishMethod.getChanged().length; removed = MockPublishMethod.getRemoved().length; assertEquals(0,changed); - assertEquals(1,removed); + // removing deployment + .deployed marker + assertEquals(2,removed); MockPublishMethod.reset(); }