diff options
author | kchan | 2005-10-19 21:37:10 +0000 |
---|---|---|
committer | kchan | 2005-10-19 21:37:10 +0000 |
commit | 226fd3d2b9319252f8300d18e2858615196fe88c (patch) | |
tree | 59f2122a1a1125ea3bab018978997cc1a72e6b8d /tests | |
parent | d6c65fdcc140494ae3000fcee4c443ea2a106f30 (diff) | |
download | webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.tar.gz webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.tar.xz webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.zip |
[113162] Remove module from signature.
Diffstat (limited to 'tests')
7 files changed, 33 insertions, 35 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 index 0e73fa587..c4189afc1 100644 --- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF @@ -22,5 +22,6 @@ Require-Bundle: org.eclipse.jst.ws, org.eclipse.test.performance, org.eclipse.wst.command.env.ui, org.eclipse.wst.command.env.core, - org.eclipse.wst.common.environment + org.eclipse.wst.common.environment, + org.eclipse.wst.common.modulecore Eclipse-AutoStart: true 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 052b575ed..28fc8ee91 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 @@ -50,7 +50,7 @@ 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); + IPath destPath = ResourceUtils.getJavaSourceLocation(webProject); IFolder folder = (IFolder)ResourceUtils.findResource(destPath); JUnitUtils.copyTestData("BUJava/src",folder,env_, null); sourceFile_ = folder.getFile(new Path("foo/Echo.java")); @@ -120,7 +120,7 @@ public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test { private final void verifyOutput() throws Exception { IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME); + IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); IFolder wsdlFolder = webContentFolder.getFolder("wsdl"); assertTrue(wsdlFolder.exists()); 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 2164ee156..3ce91d2b4 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 @@ -47,7 +47,7 @@ public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test { assertTrue(webProject.exists()); // Copy Echo.wsdl file to WebContent folder - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, CLIENT_WEB_MODULE_NAME); + IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); JUnitUtils.copyTestData("TDJava",destFolder,env_, null); sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); assertTrue(sourceFile_.exists()); @@ -109,7 +109,7 @@ public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test { private final void verifyOutput() throws Exception { IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - IPath destPath = ResourceUtils.getJavaSourceLocation(webProject, CLIENT_WEB_MODULE_NAME); + IPath destPath = ResourceUtils.getJavaSourceLocation(webProject); IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath); //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME); 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 3ebce85fc..a1b6a74c7 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 @@ -44,7 +44,7 @@ public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test { IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); assertTrue(webProject.exists()); - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME); + IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); JUnitUtils.copyTestData("TDJava",destFolder,env_, null); sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); assertTrue(sourceFile_.exists()); @@ -101,7 +101,7 @@ public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test { private final void verifyOutput() throws Exception { IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME); + IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); IFolder wsdlFolder = webContentFolder.getFolder("wsdl"); 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 1a8793aac..564182f31 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 @@ -54,9 +54,9 @@ public class ComponentCreationTests extends TestCase implements WSJUnitConstants cmc.setServerFactoryId(SERVERTYPEID_TC50); cmc.execute(null, null ); - System.out.println("Done creating Web component..."+projectNm+"\""+componentName); + System.out.println("Done creating Web component..."+projectNm); IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectNm); - IVirtualComponent vc = ComponentCore.createComponent(p, componentName); + IVirtualComponent vc = ComponentCore.createComponent(p); assertTrue(vc.exists()); } @@ -73,7 +73,7 @@ public class ComponentCreationTests extends TestCase implements WSJUnitConstants System.out.println("Done creating EJB component."); IProject p = ResourceUtils.getWorkspaceRoot().getProject(ejbProjectName); - IVirtualComponent vc = ComponentCore.createComponent(p, ejbComponentName); + IVirtualComponent vc = ComponentCore.createComponent(p); assertTrue(vc.exists()); } @@ -88,7 +88,7 @@ public class ComponentCreationTests extends TestCase implements WSJUnitConstants System.out.println("Done creating App client component."); IProject p = ResourceUtils.getWorkspaceRoot().getProject(appClientProjectName); - IVirtualComponent vc = ComponentCore.createComponent(p, appClientCompName); + IVirtualComponent vc = ComponentCore.createComponent(p); assertTrue(vc.exists()); } @@ -103,7 +103,7 @@ public class ComponentCreationTests extends TestCase implements WSJUnitConstants System.out.println("Done creating EAR component."); IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectName); - IVirtualComponent vc = ComponentCore.createComponent(p, earCompName); + IVirtualComponent vc = ComponentCore.createComponent(p); 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 89d88d7aa..b05491ef2 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 @@ -29,9 +29,6 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ private IProject ejbProject = null; private String comp1 = webComponentName; - private String comp2 = webComponent2Name; - private String comp3 = webComp3Name; - private String comp4 = webComp4Name; protected void setUp() throws Exception { super.setUp(); @@ -61,11 +58,11 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ public void testComponentsExist(){ System.out.println("< BEGIN: testComponentExists ..."); - IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1, projectName); - IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName(), project2Name); + IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1); + IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName()); assertTrue(vc1.exists()); - assertTrue(J2EEUtils.exists(project1, projectName)); + assertTrue(J2EEUtils.exists(project1)); assertTrue(vc2.exists()); assertTrue(J2EEUtils.exists(project2.getName(), project2Name)); System.out.println("< END: testComponentExists ..."); @@ -74,25 +71,25 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ public void testLocationGetterMethods(){ System.out.println("< BEGIN: testLocationGetterMethods ..."); - IPath loc1 = J2EEUtils.getWebContentPath(project1, projectName); + IPath loc1 = J2EEUtils.getWebContentPath(project1); System.out.println("WebContentPath of project1 = "+loc1); IResource res = ResourceUtils.getWorkspaceRoot().findMember(loc1); assertTrue(res.exists()); assertTrue(res.toString().endsWith("WebContent")); - IPath loc2 = J2EEUtils.getWebContentPath(project2, project2Name); + IPath loc2 = J2EEUtils.getWebContentPath(project2); System.out.println("WebContentPath of project2 = "+loc2); IResource res2 = ResourceUtils.getWorkspaceRoot().findMember(loc2); assertTrue(res2.exists()); assertTrue(res2.toString().endsWith("WebContent")); - IPath loc3 = J2EEUtils.getWebInfPath(project1, projectName); + IPath loc3 = J2EEUtils.getWebInfPath(project1); System.out.println("Web-INF path = "+loc3); IResource res3 = ResourceUtils.getWorkspaceRoot().findMember(loc3); assertTrue(res3.exists()); assertTrue(res3.toString().endsWith("WEB-INF")); - IContainer container = J2EEUtils.getWebContentContainer(project2, project2Name); + IContainer container = J2EEUtils.getWebContentContainer(project2); IResource res4 = ResourceUtils.getWorkspaceRoot().findMember(container.getFullPath()); assertEquals(res2, res4); @@ -104,12 +101,12 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ System.out.println("< BEGIN: testJ2EEVersionMethods ..."); - IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2, project2Name); + IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2); int j2 = J2EEUtils.getJ2EEVersion(vc2); System.out.println("J2EEVersions p1: "+j2); assertEquals(j2, J2EEVersionConstants.VERSION_1_3); - String j3 = J2EEUtils.getJ2EEVersionAsString(project1, projectName); + String j3 = J2EEUtils.getJ2EEVersionAsString(project1); System.out.println("J2EEVersion p1 as String: "+j3); assertEquals(j3, J2EEVersionConstants.VERSION_1_4_TEXT); @@ -180,14 +177,14 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ System.out.println("< BEGIN: testReferencingGetterMethods ..."); System.out.println("isComponentAssociated .."); - J2EEUtils.isComponentAssociated(project1, earCompName, project1, comp1); + J2EEUtils.isComponentAssociated(project1, project1); - String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1, projectName)); + String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1)); printNameStrings(names); - String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2, project2Name)); + String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2)); printNameStrings(names2); - String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1, earCompName)); + String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1)); printNameStrings(names3); System.out.println("< END: testReferencingGetterMethods ..."); @@ -198,7 +195,7 @@ public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ System.out.println("< BEGIN: testIsComponentMethods ..."); //assertFalse(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName)); - assertTrue(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName)); + assertTrue(J2EEUtils.isEJB20Component(ejbProject)); System.out.println("< END: testIsComponentMethods ..."); } diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java index 39d743444..0a9683c03 100644 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java +++ b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java @@ -33,13 +33,13 @@ public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ public void testComponentType(){ IProject project = ProjectUtilities.getProject(projectName); - String componentType = ResourceUtils.getComponentType(project, projectName); + String componentType = ResourceUtils.getComponentType(project); assertEquals(IModuleConstants.JST_WEB_MODULE, componentType); } public void testComponentOf(){ IProject project = ProjectUtilities.getProject(projectName); - IPath destPath = ResourceUtils.getJavaSourceLocation(project, projectName); + IPath destPath = ResourceUtils.getJavaSourceLocation(project); IFolder folder = (IFolder)ResourceUtils.findResource(destPath); try { PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); @@ -64,13 +64,13 @@ public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ public void testJavaSourceLocation(){ IProject project = ProjectUtilities.getProject(projectName); - String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project, projectName).toString(); + String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project).toString(); System.out.println("Java source location = "+javaSourceLoc); assertTrue(javaSourceLoc.endsWith("JavaSource")); // get all the JavaSourceLocations via the VirtualComponent - IVirtualComponent vc1 = ComponentCore.createComponent(project, projectName); - IVirtualComponent vc2 = ComponentCore.createComponent(project, projectName); + IVirtualComponent vc1 = ComponentCore.createComponent(project); + IVirtualComponent vc2 = ComponentCore.createComponent(project); IVirtualComponent[] vcs = new IVirtualComponent[]{vc1, vc2}; IPath[] paths = ResourceUtils.getAllJavaSourceLocations(vcs); @@ -91,7 +91,7 @@ public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ public void testWebComponentServerRoot() { IProject project = ProjectUtilities.getProject(projectName); - IFolder folder = ResourceUtils.getWebComponentServerRoot(project, projectName); + IFolder folder = ResourceUtils.getWebComponentServerRoot(project); assertTrue(folder.exists()); } |