[98737] Performance: Update to WS performance tests

10 files changed, 92 insertions, 73 deletions

diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..62eb53cc5
--- /dev/null
+++ b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Axis Perfmsr Plug-in
+Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance
+Bundle-Version: 1.0.0
+Bundle-ClassPath: axisPerfmsr.jar
+Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin
+Bundle-Vendor: IBM
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr,
+ org.eclipse.jst.ws.tests.performance,
+ org.eclipse.jst.ws.tests.performance.plugin
+Require-Bundle: org.eclipse.jst.ws.consumption.ui,
+ org.eclipse.jst.ws.consumption,
+ org.eclipse.jst.ws.ui,
+ org.eclipse.jst.ws,
+ org.eclipse.wst.command.env.core,
+ org.eclipse.wst.command.env.ui,
+ org.eclipse.wst.command.env,
+ org.eclipse.jst.server.core,
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.j2ee.core,
+ org.eclipse.jst.j2ee,
+ org.eclipse.wst.web,
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.launching,
+ org.eclipse.jdt.core,
+ org.eclipse.ui,
+ org.junit,
+ org.eclipse.jst.ws.tests,
+ org.eclipse.jem.util,
+ org.eclipse.test.performance
+Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties
index 4c31a56e6..e7120507e 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/build.properties
+++ b/tests/org.eclipse.jst.ws.tests.performance/build.properties
@@ -1,7 +1,8 @@
 bin.includes = build.xml,\
                plugin.xml,\
                test.xml,\
-               axisPerfmsr.jar
+               axisPerfmsr.jar,\
+               META-INF/
 jars.compile.order = axisPerfmsr.jar
 source.axisPerfmsr.jar = src/
 output.axisPerfmsr.jar = bin/
diff --git a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml b/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
index 3d0520a81..7bf65fb5f 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
+++ b/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
@@ -1,43 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.ws.tests.performance"
-   name="Axis Perfmsr Plug-in"
-   version="1.0.0"
-   provider-name="IBM"
-   class="org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin">
-
-   <runtime>
-      <library name="axisPerfmsr.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-     <import plugin="org.eclipse.jst.ws.consumption.ui"/>
-     <import plugin="org.eclipse.jst.ws.consumption"/>
-     <import plugin="org.eclipse.jst.ws.ui"/>
-     <import plugin="org.eclipse.jst.ws"/>
-     <import plugin="org.eclipse.wst.command.env.core"/>
-     <import plugin="org.eclipse.wst.command.env.ui"/>
-     <import plugin="org.eclipse.wst.command.env"/>
-     <import plugin="org.eclipse.jst.server.core"/>
-     <import plugin="org.eclipse.wst.server.core"/>
-     <import plugin="org.eclipse.jst.j2ee.core"/>
-     <import plugin="org.eclipse.jst.j2ee"/>
-     <import plugin="org.eclipse.wst.web"/>
-     <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-     <!-- import plugin="com.ibm.wtp.common"/ -->
-     <import plugin="org.eclipse.core.runtime"/>
-     <import plugin="org.eclipse.core.resources"/>
-     <import plugin="org.eclipse.debug.core"/>
-     <import plugin="org.eclipse.jdt.launching"/>     
-     <import plugin="org.eclipse.jdt.core"/>     
-     <import plugin="org.eclipse.ui"/>
-     <import plugin="org.junit"/>
-     <import plugin="org.eclipse.jst.ws.tests"/>
-     <import plugin="org.eclipse.jem.util"/>
-     <import plugin="org.eclipse.test.performance"/>
-   </requires>
+<plugin>
 
+    
 </plugin>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
index 6cb13e5d7..5e41eff72 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
@@ -24,11 +24,10 @@ import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
  */
 public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
 	// Constants
-  private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-  
+    private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
 	private final String PROJECT_NAME = "TestBUWeb";
-  private final String WEB_MODULE_NAME = "TestBUWebModule";
-	
+    private final String WEB_MODULE_NAME = "TestBUWebModule";
+
 	private IFile sourceFile_;
 	
   /**
@@ -38,10 +37,8 @@ public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
    */
 	protected void installInputData() throws Exception
 	{
-//		JUnitUtils.startServer(server_, env_);
-
 		// Create a Web project (TestWeb) targetted to Tomcat 5.0
-		Status s = JUnitUtils.createWebProject(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), env_);
+		Status s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), env_);
 		if (s.getSeverity() != Status.OK) {
 		  System.out.println("Error: "+s.getMessage());
 			throw new Exception(s.getThrowable());
@@ -53,8 +50,8 @@ public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
 		// Copy the contents of data/<test name> to the Web project's source folder.
 		// <Web Project>/JavaSource/foo/Echo.java
 		//IFolder destFolder = JUnitUtils.getSourceFolderForWebProject(WEB_PROJECT_NAME);
-    IPath destPath = ResourceUtils.getJavaSourceLocation(webProject, WEB_MODULE_NAME);
-    IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
+        IPath destPath = ResourceUtils.getJavaSourceLocation(webProject, WEB_MODULE_NAME);
+        IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
 		JUnitUtils.copyTestData("BUJava/src",folder,env_);
 		sourceFile_ = folder.getFile(new Path("foo/Echo.java"));
 		assertTrue(sourceFile_.exists());
@@ -122,19 +119,19 @@ public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
    */
 	private final void verifyOutput() throws Exception
 	{
-    IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);    
+        IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);    
 		IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME);
     
-    IPath webInfPath = J2EEUtils.getWebInfPath(webProject, WEB_MODULE_NAME);
+        IPath webInfPath = J2EEUtils.getWebInfPath(webProject, WEB_MODULE_NAME);
 		IFolder webInfFolder = (IFolder)ResourceUtils.findResource(webInfPath);
 
-    IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
+        IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
 		assertTrue(wsdlFolder.exists());
 		assertTrue(wsdlFolder.members().length > 0);
 		assertTrue(webContentFolder.getFolder("wsdl").members().length > 0);
     
-    //TODO Check if wsdd contains new Web service
-    //TODO Check if Web serivce can be invoked by a client
+        //TODO Check if wsdd contains new Web service
+        //TODO Check if Web serivce can be invoked by a client
 	}
 	
   /**
@@ -148,8 +145,7 @@ public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
 		
 		// Delete the Web project.
 		webProject.delete(true,true,EnvironmentUtils.getIProgressMonitor(env_));
-    assertFalse(webProject.exists());
-		
+        assertFalse(webProject.exists());
 		
 	}
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
index b2ccd4e68..0ec971c37 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
@@ -39,7 +39,7 @@ public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test {
 	protected void installInputData() throws Exception {
 		
 		// Create an associated Web project (TestWeb) targetted to Tomcat v5.0 
-		Status s = JUnitUtils.createWebProject(CLIENT_PROJECT_NAME, CLIENT_WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_);
+		Status s = JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_);
 		if (s.getSeverity() != Status.OK)
 			throw new Exception(s.getThrowable());
     
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
index ea0b0b349..d573bc8ab 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
+++ b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
@@ -39,7 +39,7 @@ public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test {
 	protected void installInputData() throws Exception {
 
 		// Create an associated Web project (TestWeb) targetted to Tomcat 5.0
-		Status s = JUnitUtils.createWebProject(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_);
+		Status s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_);
 		if (s.getSeverity() != Status.OK)
 			throw new Exception(s.getThrowable());
     
diff --git a/tests/org.eclipse.jst.ws.tests.performance/test.xml b/tests/org.eclipse.jst.ws.tests.performance/test.xml
index 1d14b3d1d..6c39a8f45 100644
--- a/tests/org.eclipse.jst.ws.tests.performance/test.xml
+++ b/tests/org.eclipse.jst.ws.tests.performance/test.xml
@@ -22,13 +22,34 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="performance_suite">
+  	
+    <delete dir="${workspace}" quiet="true"/>    	
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
       <property name="data-dir" value="${workspace}"/>
       <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.ws.tests.performance.AllPerformanceTests" />
+      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
       <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
       <property name="extraVMargs" value="${extraVMargs}"/>      
     </ant>
+  	
+    <delete dir="${workspace}" quiet="true"/>    	
+    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="data-dir" value="${workspace}"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
+      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
+      <property name="extraVMargs" value="${extraVMargs}"/>      
+    </ant>
+  	
+    <delete dir="${workspace}" quiet="true"/>    	
+    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="data-dir" value="${workspace}"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
+      <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
+      <property name="extraVMargs" value="${extraVMargs}"/>      
+    </ant>  	
+  	
   </target>
 
   <!-- This target holds code to cleanup the testing environment after -->
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
index 34b4ae072..544caf21e 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
@@ -28,11 +28,11 @@ public class ComponentCreationTests extends TestCase implements WSJUnitConstants
 
         enableFlexProjectPreference();
         createServerRuntime();
-        createWebModule(webProjectName, webComponentName, J2EEVersionConstants.J2EE_1_4_ID);
-        createWebModule(webProjectName, webComponent2Name, J2EEVersionConstants.J2EE_1_3_ID);
+        createWebModule(projectName, webComponentName, J2EEVersionConstants.J2EE_1_4_ID);
+        createWebModule(projectName, webComponent2Name, J2EEVersionConstants.J2EE_1_3_ID);
         
-        createWebModule(webProject2Name, webComp3Name, J2EEVersionConstants.J2EE_1_3_ID);
-        createWebModule(webProject2Name, webComp4Name, J2EEVersionConstants.J2EE_1_3_ID);
+        createWebModule(project2Name, webComp3Name, J2EEVersionConstants.J2EE_1_3_ID);
+        createWebModule(project2Name, webComp4Name, J2EEVersionConstants.J2EE_1_3_ID);
         
 	}
   
@@ -104,12 +104,12 @@ public class ComponentCreationTests extends TestCase implements WSJUnitConstants
       cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
       cmc.setModuleName(earCompName);
       cmc.setModuleType(CreateModuleCommand.EAR);
-      cmc.setProjectName(webProjectName);
+      cmc.setProjectName(projectName);
       cmc.setServerFactoryId(SERVERTYPEID_TC50);
       cmc.execute(null);
       
       System.out.println("Done creating EAR component.");
-      IProject p = ResourceUtils.getWorkspaceRoot().getProject(webProjectName);
+      IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectName);
       IVirtualComponent vc = ComponentCore.createComponent(p, earCompName);
       assertTrue(vc.exists());       
     }
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
index cd44d1b5b..b0802a8fd 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
@@ -37,10 +37,10 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{
 		super.setUp();
 		
 		// Project and component names initialized here!
-		project1 = ProjectUtilities.getProject(webProjectName);
+		project1 = ProjectUtilities.getProject(projectName);
 		assertNotNull(project1);
 		
-		project2 = ProjectUtilities.getProject(webProject2Name);
+		project2 = ProjectUtilities.getProject(project2Name);
 		assertNotNull(project2);
     
         ejbProject = ProjectUtilities.getProject(ejbProjectName);
@@ -173,9 +173,9 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{
         
         AssociateModuleWithEARCommand amwe = new AssociateModuleWithEARCommand();
         amwe.setEar(earCompName);
-        amwe.setEARProject(webProjectName);
+        amwe.setEARProject(projectName);
         amwe.setModule(comp1);
-        amwe.setProject(webProjectName);
+        amwe.setProject(projectName);
         amwe.execute(null);
         
         System.out.println("< END: testAssociateComponentCommand ...");     
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
index ce8a8fb6a..ca9a5243e 100644
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
+++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
@@ -10,18 +10,20 @@ public interface WSJUnitConstants {
   
   public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
   
-  public final String webProjectName = "WP";
-  public final String webProject2Name = "WP2";
+  public final String webProjectName = "WebProject";
+  
+  public final String projectName = "FlexProject";
+  public final String project2Name = "FlexProject2";
   public final String webComponentName = "webComponent";
   public final String webComponent2Name = "webComp2";
   public final String webComp3Name = "webComp3";
   public final String webComp4Name = "webComp4";
   
   
-  public final String ejbProjectName = "EJBProject";
+  public final String ejbProjectName = "FlexEJBProject";
   public final String ejbComponentName = "ejbComponent";
 
-  public final String appClientProjectName = "AppClientProject";
+  public final String appClientProjectName = "FlexAppClientProject";
   public final String appClientCompName = "appClientComponent";  
   
   public final String earCompName = "EARComponent";