Author: rob.stryker(a)jboss.com Date: 2011-07-20 04:34:08 -0400 (Wed, 20 Jul 2011) New Revision: 33068 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java Log: Broken AS build test suite. Regression from ensuring that for as7 the folder is removed in addition to the .deployed file. Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-07-20 04:43:15 UTC (rev 33067) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-07-20 08:34:08 UTC (rev 33068) @@ -11,6 +11,8 @@ package org.jboss.ide.eclipse.as.test.publishing.v2; import java.io.IOException; +import java.util.Arrays; +import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -84,7 +86,9 @@ * <li>newModule.war.failed</li> * </ul> */ - testMockPublishMethod(8,"newModule.war" + DeploymentMarkerUtils.FAILED_DEPLOY,"newModule.war" + DeploymentMarkerUtils.DEPLOYED); + testMockPublishMethod(8, "newModule.war", + "newModule.war" + DeploymentMarkerUtils.FAILED_DEPLOY, + "newModule.war" + DeploymentMarkerUtils.DEPLOYED); } private void testMockPublishMethod(int initial, String... filesToRemove) throws CoreException, IOException { @@ -93,16 +97,19 @@ IModule mod = ServerUtil.getModule(project); server = ServerRuntimeUtils.addModule(server,mod); ServerRuntimeUtils.publish(server); - assertEquals(initial, MockPublishMethod.getChanged().length); + IPath[] changed = MockPublishMethod.getChanged(); + assertEquals(initial, changed.length); MockPublishMethod.reset(); // remove server = ServerRuntimeUtils.removeModule(server, mod); ServerRuntimeUtils.publish(server); - assertEquals(filesToRemove.length, MockPublishMethod.getRemoved().length); + IPath[] rem = MockPublishMethod.getRemoved(); + assertEquals(filesToRemove.length, rem.length); IPath[] removedFiles = MockPublishMethod.getRemoved(); + List<IPath> removedAsList = Arrays.asList(removedFiles); for(int i = 0; i < removedFiles.length; i++) { - assertEquals(MockPublishMethod.MOCK_ROOT + "/" + filesToRemove[i], removedFiles[i].toString()); + assertTrue(removedAsList.contains(new Path(MockPublishMethod.MOCK_ROOT + "/" + filesToRemove[i]))); } MockPublishMethod.reset(); } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-07-20 04:43:15 UTC (rev 33067) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-07-20 08:34:08 UTC (rev 33068) @@ -98,7 +98,7 @@ assertRemoved( isAs7, new String[] { "newModule.ear" }, - new String[] { "newModule.ear.deployed", "newModule.ear.failed" }); + new String[] { "newModule.ear", "newModule.ear.deployed", "newModule.ear.failed" }); } protected void assertRemoved(boolean isAs7, String[] nonAs7, String[] as7) { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-07-20 04:43:15 UTC (rev 33067) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-07-20 08:34:08 UTC (rev 33068) @@ -203,7 +203,7 @@ ServerRuntimeUtils.publish(server); JobUtils.waitForIdle(); assertEquals(changed2.size(), 0); - assertEquals(removed2.size(), 2); // [test.xml.failed, test.xml.deployed] + assertEquals(removed2.size(), 3); // [test.xml, test.xml.failed, test.xml.deployed] MockPublishMethod.reset(); } @@ -249,7 +249,7 @@ ServerRuntimeUtils.publish(server); JobUtils.waitForIdle(); assertEquals(changed2.size(), 0); - assertEquals(removed2.size(), 2); // [test.failed, test.deployed] + assertEquals(removed2.size(), 3); // [test.xml, test.failed, test.deployed] MockPublishMethod.reset(); }