Author: rob.stryker(a)jboss.com Date: 2011-08-11 03:08:43 -0400 (Thu, 11 Aug 2011) New Revision: 33802 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 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/JSTZippedDeploymentTester.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/MockJSTPublisherTestDynUtil.java Log: JBIDE-9488 - test failures Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -35,15 +35,31 @@ public class AbstractJSTDeploymentTester extends TestCase { protected IProject project; protected IServer server; - final String MODULE_NAME = "newModule"; - final String CONTENT_DIR = "contentDirS"; - final String TEXT_FILE = "test.txt"; - final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE); + private final String MODULE_NAME = "newModule"; + private final String CONTENT_DIR = "contentDirS"; + private final String TEXT_FILE = "test.txt"; + private final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE); public void setUp() throws Exception { project = createProject(); server = ServerRuntimeUtils.createMockDeployOnlyServer(); } + protected String getModuleName() { + return MODULE_NAME; + } + + protected String getContentDir() { + return CONTENT_DIR; + } + + protected String getTextFile() { + return TEXT_FILE; + } + + protected IPath getContentTextFilePath() { + return CONTENT_TEXT_FILE; + } + public void tearDown() throws Exception { ServerRuntimeUtils.deleteAllServers(); ServerRuntimeUtils.deleteAllRuntimes(); @@ -51,9 +67,9 @@ ASTest.clearStateLocation(); } protected IProject createProject() throws Exception { - IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false); + IDataModel dm = ProjectCreationUtil.getEARDataModel(getModuleName(), getContentDir(), null, null, JavaEEFacetConstants.EAR_5, false); OperationTestCase.runAndVerify(dm); - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getModuleName()); assertTrue(p.exists()); return p; } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java 2011-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -30,11 +30,15 @@ import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; public class JSTDeployBinaryChildModuleTest extends AbstractJSTDeploymentTester { + protected String getModuleName() { + return super.getModuleName() + "JSTDeployBinaryChild"; + } + @Override protected IProject createProject() throws Exception { - IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, null, null, JavaEEFacetConstants.WEB_24, false); + IDataModel dm = ProjectCreationUtil.getWebDataModel(getModuleName(), null, null, null, null, JavaEEFacetConstants.WEB_24, false); OperationTestCase.runAndVerify(dm); - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getModuleName()); assertTrue(p.exists()); File srcFile = AbstractDeploymentTest.getFileLocation("projectPieces/EJB3NoDescriptor.jar"); String proj = p.getLocation().toOSString(); @@ -52,7 +56,7 @@ server = ServerRuntimeUtils.addModule(server, mod); ServerRuntimeUtils.publish(server); IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server)); - IPath rootFolder = deployRoot.append(MODULE_NAME + ".war"); + IPath rootFolder = deployRoot.append(getModuleName() + ".war"); assertTrue(rootFolder.toFile().exists()); IPath webinf_lib_testjar = rootFolder.append("WEB-INF").append("lib").append("test.jar"); assertTrue("test.jar exists in deployment", webinf_lib_testjar.toFile().exists()); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2011-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -31,21 +31,21 @@ server = ServerRuntimeUtils.addModule(server,mod); ServerRuntimeUtils.publish(server); IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server)); - IPath rootFolder = deployRoot.append(MODULE_NAME + ".ear"); + IPath rootFolder = deployRoot.append(getModuleName() + ".ear"); assertTrue(rootFolder.toFile().exists()); assertTrue(IOUtil.countFiles(rootFolder.toFile()) == 0); assertTrue(IOUtil.countAllResources(rootFolder.toFile()) == 1); - IFile textFile = project.getFile(CONTENT_TEXT_FILE); + IFile textFile = project.getFile(getContentTextFilePath()); IOUtil.setContents(textFile, 0); assertEquals(IOUtil.countFiles(rootFolder.toFile()), 0); assertTrue(IOUtil.countAllResources(rootFolder.toFile()) == 1); ServerRuntimeUtils.publish(server); assertEquals(IOUtil.countFiles(rootFolder.toFile()), 1); assertTrue(IOUtil.countAllResources(rootFolder.toFile()) == 2); - assertContents(rootFolder.append(TEXT_FILE).toFile(), 0); + assertContents(rootFolder.append(getTextFile()).toFile(), 0); IOUtil.setContents(textFile, 1); ServerRuntimeUtils.publish(server); - assertContents(rootFolder.append(TEXT_FILE).toFile(), 1); + assertContents(rootFolder.append(getTextFile()).toFile(), 1); textFile.delete(true, null); assertEquals(IOUtil.countFiles(rootFolder.toFile()), 1); assertTrue(IOUtil.countAllResources(rootFolder.toFile()) == 2); 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-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -32,9 +32,10 @@ @Override protected IProject createProject() throws Exception { - IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, CONTENT_DIR, null, JavaEEFacetConstants.WEB_25, true); + IDataModel dm = ProjectCreationUtil.getWebDataModel(getModuleName(), null, null, + getContentDir(), null, JavaEEFacetConstants.WEB_25, true); OperationTestCase.runAndVerify(dm); - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getModuleName()); assertTrue(p.exists()); return p; } @@ -48,10 +49,10 @@ server = ServerRuntimeUtils.addModule(server,mod); ServerRuntimeUtils.publish(server); IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server)); - IPath rootFolder = deployRoot.append(MODULE_NAME + ".war"); + IPath rootFolder = deployRoot.append(getModuleName() + ".war"); assertTrue(rootFolder.toFile().exists()); - long workspaceModified = project.getFolder(CONTENT_DIR).getFolder("WEB-INF").getFile("web.xml").getLocation().toFile().lastModified(); + long workspaceModified = project.getFolder(getContentDir()).getFolder("WEB-INF").getFile("web.xml").getLocation().toFile().lastModified(); long publishedModified = rootFolder.append("WEB-INF").append("web.xml").toFile().lastModified(); // FULL PUBLISH and verify web xml's timestamp Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -54,13 +54,13 @@ @Override protected IProject createProject() throws Exception { - IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false); + IDataModel dm = ProjectCreationUtil.getEARDataModel(getModuleName(), getContentDir(), null, null, JavaEEFacetConstants.EAR_5, false); OperationTestCase.runAndVerify(dm); - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getModuleName()); assertTrue(p.exists()); File srcFile = AbstractDeploymentTest.getFileLocation("projectPieces/mvel2.jar"); - IPath contentDir = p.getFolder(CONTENT_DIR).getLocation(); + IPath contentDir = p.getFolder(getContentDir()).getLocation(); File destFile = new File(contentDir.toFile(), "mvel2.jar"); FileUtil.fileSafeCopy(srcFile, destFile); p.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); @@ -95,7 +95,7 @@ IPath projLoc = project.getLocation(); System.out.println(projLoc); IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server)); - IPath zipped = deployRoot.append(MODULE_NAME + ".ear"); + IPath zipped = deployRoot.append(getModuleName() + ".ear"); assertTrue(zipped.toFile().exists()); assertTrue(zipped.toFile().isFile()); IPath unzip1 = ASTest.getDefault().getStateLocation().append("unzip1"); 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-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -56,7 +56,7 @@ new String[] { "newModule.ear", "newModule.ear.failed" }); MockPublishMethod.reset(); - IFile textFile = project.getFile(CONTENT_TEXT_FILE); + IFile textFile = project.getFile(getContentTextFilePath()); IOUtil.setContents(textFile, 0); assertEquals(0, MockPublishMethod.getChanged().length); ServerRuntimeUtils.publish(server); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java 2011-08-11 06:46:25 UTC (rev 33801) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTestDynUtil.java 2011-08-11 07:08:43 UTC (rev 33802) @@ -37,11 +37,14 @@ import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; public class MockJSTPublisherTestDynUtil extends MockJSTPublisherTest { - final String MODULE_NAME = "newModule5"; + protected String getModuleName() { + return "newModule5"; + } protected IProject createProject() throws Exception { - IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, CONTENT_DIR, null, JavaEEFacetConstants.WEB_25, false); + IDataModel dm = ProjectCreationUtil.getWebDataModel(getModuleName(), null, null, + getContentDir(), null, JavaEEFacetConstants.WEB_25, false); OperationTestCase.runAndVerify(dm); - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getModuleName()); System.out.println(p.getLocation().toOSString()); IDataModel dm2 = ProjectCreationUtil.getUtilityProjectCreationDataModel("util", null);