Author: rob.stryker(a)jboss.com Date: 2011-07-07 05:04:39 -0400 (Thu, 07 Jul 2011) New Revision: 32690 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/MockPublishMethod.java Log: Some small test changes in preparation of a future test 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-07 08:31:10 UTC (rev 32689) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-07-07 09:04:39 UTC (rev 32690) @@ -102,7 +102,7 @@ assertEquals(filesToRemove.length, MockPublishMethod.getRemoved().length); IPath[] removedFiles = MockPublishMethod.getRemoved(); for(int i = 0; i < removedFiles.length; i++) { - assertEquals(filesToRemove[i], removedFiles[i].toString()); + assertEquals(MockPublishMethod.MOCK_ROOT + "/" + filesToRemove[i], removedFiles[i].toString()); } 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-07 08:31:10 UTC (rev 32689) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-07-07 09:04:39 UTC (rev 32690) @@ -118,14 +118,14 @@ if (isAs7) { for (String expectedPath : as7) { - if (contains(expectedPath, artifacts)) { + if (contains(MockPublishMethod.MOCK_ROOT + "/" + expectedPath, artifacts)) { continue; } fail(expectedPath + " was not among the changed/removed artifacts"); } } else { for (String expectedPath : nonAs7) { - if (contains(expectedPath, artifacts)) { + if (contains(MockPublishMethod.MOCK_ROOT + "/" + expectedPath, artifacts)) { continue; } fail(expectedPath + " was not among the changed/removed artifacts"); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-07-07 08:31:10 UTC (rev 32689) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-07-07 09:04:39 UTC (rev 32690) @@ -27,6 +27,7 @@ public class MockPublishMethod extends AbstractPublishMethod { public static final String PUBLISH_METHOD_ID = "mock"; + public static final String MOCK_ROOT = "mockRoot"; public static ArrayList<IPath> changed = new ArrayList<IPath>(); public static ArrayList<IPath> removed = new ArrayList<IPath>(); @@ -36,7 +37,7 @@ } public String getPublishDefaultRootFolder(IServer server) { - return "/"; + return "/" + MOCK_ROOT; } public String getPublishMethodId() {