Author: adietish Date: 2011-06-15 16:44:29 -0400 (Wed, 15 Jun 2011) New Revision: 32126 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/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 Log: [JBIDE-9153] cleaned call hierarchy 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-06-15 20:36:24 UTC (rev 32125) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/AbstractJSTDeploymentTester.java 2011-06-15 20:44:29 UTC (rev 32126) @@ -30,7 +30,7 @@ final String TEXT_FILE = "test.txt"; final IPath CONTENT_TEXT_FILE = new Path(CONTENT_DIR).append(TEXT_FILE); public void setUp() throws Exception { - project = createEARProject(); + project = createProject(); server = ServerRuntimeUtils.createMockDeployOnlyServer(); } @@ -40,7 +40,7 @@ ProjectUtility.deleteAllProjects(); ASTest.clearStateLocation(); } - protected IProject createEARProject() throws Exception { + protected IProject createProject() throws Exception { IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false); OperationTestCase.runAndVerify(dm); IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); 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-06-15 20:36:24 UTC (rev 32125) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeployBinaryChildModuleTest.java 2011-06-15 20:44:29 UTC (rev 32126) @@ -20,7 +20,8 @@ import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; public class JSTDeployBinaryChildModuleTest extends AbstractJSTDeploymentTester { - protected IProject createEARProject() throws Exception { + @Override + protected IProject createProject() throws Exception { IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, null, null, JavaEEFacetConstants.WEB_24, false); OperationTestCase.runAndVerify(dm); IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); 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-06-15 20:36:24 UTC (rev 32125) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java 2011-06-15 20:44:29 UTC (rev 32126) @@ -20,7 +20,8 @@ public class JSTDeploymentWarUpdateXML extends AbstractJSTDeploymentTester { - protected IProject createEARProject() throws Exception { + @Override + protected IProject createProject() throws Exception { IDataModel dm = ProjectCreationUtil.getWebDataModel(MODULE_NAME, null, null, CONTENT_DIR, null, JavaEEFacetConstants.WEB_25, true); OperationTestCase.runAndVerify(dm); IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); 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-06-15 20:36:24 UTC (rev 32125) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTZippedDeploymentTester.java 2011-06-15 20:44:29 UTC (rev 32126) @@ -30,7 +30,7 @@ public class JSTZippedDeploymentTester extends AbstractJSTDeploymentTester { public void setUp() throws Exception { - project = createEARProject(); + project = createProject(); server = ServerRuntimeUtils.createMockDeployOnlyServer(); setZipFlag(); } @@ -42,7 +42,8 @@ server = wc.save(true, new NullProgressMonitor()); } - protected IProject createEARProject() throws Exception { + @Override + protected IProject createProject() throws Exception { IDataModel dm = ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTENT_DIR, null, null, JavaEEFacetConstants.EAR_5, false); OperationTestCase.runAndVerify(dm); IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(MODULE_NAME); 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-06-15 20:36:24 UTC (rev 32125) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockJSTPublisherTest.java 2011-06-15 20:44:29 UTC (rev 32126) @@ -3,7 +3,6 @@ import java.io.IOException; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.wst.server.core.IModule; @@ -18,7 +17,7 @@ public void testNormalLogic() throws CoreException, IOException, Exception { server = ServerRuntimeUtils.createMockDeployOnlyServer(); server = ServerRuntimeUtils.useMockPublishMethod(server); - project = createEARProject(); + project = createProject(); MockPublishMethod.reset(); theTest(false); } @@ -26,7 +25,7 @@ public void testForced7Logic() throws CoreException, IOException, Exception { server = ServerRuntimeUtils.createMockJBoss7Server(); server = ServerRuntimeUtils.useMockPublishMethod(server); - project = createEARProject(); + project = createProject(); MockPublishMethod.reset(); theTest(true); }