diff options
Diffstat (limited to 'tests')
446 files changed, 0 insertions, 19565 deletions
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.classpath b/tests/org.eclipse.jst.ws.tests.performance/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore b/tests/org.eclipse.jst.ws.tests.performance/.cvsignore deleted file mode 100644 index 434810902..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -axisPerfmsr.jar diff --git a/tests/org.eclipse.jst.ws.tests.performance/.project b/tests/org.eclipse.jst.ws.tests.performance/.project deleted file mode 100644 index 088e1a830..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.ws.tests.performance</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> 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 deleted file mode 100644 index 276b0dbcd..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -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, - org.eclipse.jst.j2ee.core, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.ui, - org.eclipse.wst.server.core, - org.junit, - org.eclipse.jst.ws.tests, - org.eclipse.jem.util, - 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.modulecore -Eclipse-AutoStart: true diff --git a/tests/org.eclipse.jst.ws.tests.performance/about.html b/tests/org.eclipse.jst.ws.tests.performance/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties deleted file mode 100644 index bf17c58dd..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -bin.includes = build.xml,\ - plugin.xml,\ - test.xml,\ - axisPerfmsr.jar,\ - META-INF/,\ - about.html -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 deleted file mode 100644 index 7bf65fb5f..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<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 deleted file mode 100644 index 5a9201ada..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test; -import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.jst.ws.tests.util.ScenarioConstants; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; - -/** - * Bottom up performance scenario with Axis and Tomcat v5.0 - */ -public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test { - // Constants - private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS; - private final String PROJECT_NAME = WSJUnitConstants.BU_PROJECT_NAME; - - /* could be removed later */ - private final String WEB_MODULE_NAME = "TestBUWebModule"; - - private IFile sourceFile_; - - /** - * Sets up the input data; - * - create project(s), - * - copy resources to workspace - */ - protected void installInputData() throws Exception - { - // Create a Web project (TestWeb) targetted to Tomcat 5.0 - /* - IStatus s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), env_, null); - if (s.getSeverity() != Status.OK) { - System.out.println("Error: "+s.getMessage()); - throw new Exception(s.getException()); - } - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - assertTrue(webProject.exists()); - */ - - // 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); - IFolder folder = (IFolder)ResourceUtils.findResource(destPath); - JUnitUtils.copyTestData("BUJava/src",folder,env_, null); - sourceFile_ = folder.getFile(new Path("foo/Echo.java")); - assertTrue(sourceFile_.exists()); - */ - - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IPath destPath = ResourceUtils.getJavaSourceLocation(webProject); - IFolder folder = (IFolder)ResourceUtils.findResource(destPath); - sourceFile_ = folder.getFile(new Path("foo/Echo.java")); - // Ensure that Echo.class is built in: - // <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class - JUnitUtils.syncBuildProject(webProject,env_, null); - //assertTrue(JUnitUtils.getClassesFolderForWebProject(WEB_PROJECT_NAME).getFile(new Path("foo/Echo.class")).exists()); - - - } - - - - /** - * Set the persistent server runtime context preferences - */ - protected void initJ2EEWSRuntimeServerDefaults() throws Exception - { - // Set default preferences for Axis and Tomcat 5.0 - JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50); - } - - /** - * Set the initial selection - */ - protected void initInitialSelection() throws Exception - { - initialSelection_ = new StructuredSelection(sourceFile_); - } - - /** - * Launches the pop-up command to initiate the scenario - * @throws Exception - */ - public void testBUJavaAxisTC50() throws Exception - { - IStatus status = Status.OK_STATUS; - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - JUnitUtils.disableWSIDialog(webProject); - - Performance perf= Performance.getDefault(); - PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this)); - try { - - performanceMeter.start(); - status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_); - performanceMeter.stop(); - - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - } - finally { - performanceMeter.dispose(); - } - - if (status.getSeverity() == Status.OK) - verifyOutput(); - else - throw new Exception(status.getException()); - - } - - /** - * Verify the scenario completed successfully - * @throws Exception - */ - private final void verifyOutput() throws Exception - { - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - - 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 - } - - /** - * Clear workspace if necessary - */ - protected void deleteInputData() throws Exception - { - // Remove the EAR from the server. - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - //JUnitUtils.removeModuleFromServer(server_,webProject,env_); - - // Delete the Web project. - webProject.delete(true,true, null); - 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 deleted file mode 100644 index 868f1ee90..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test; -import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.jst.ws.tests.util.ScenarioConstants; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; - -/** - * Client performance scenario with Axis and Tomcat v5.0 - */ -public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test { - - private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS; - - private final String CLIENT_PROJECT_NAME = WSJUnitConstants.CLIENT_PROJECT_NAME; - - /* module name to be removed later */ - private final String CLIENT_WEB_MODULE_NAME = "TestWebClientModule"; - - private IFile sourceFile_; - - /** - * Sets up the input data; - * - create project(s), - * - copy resources to workspace - */ - protected void installInputData() throws Exception { - - /* - // Create an associated Web project (TestWeb) targetted to Tomcat v5.0 - IStatus s = JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_, null); - if (s.getSeverity() != Status.OK) - throw new Exception(s.getException()); - - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - assertTrue(webProject.exists()); - - // Copy Echo.wsdl file to WebContent folder - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - JUnitUtils.copyTestData("TDJava",destFolder,env_, null); - sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); - assertTrue(sourceFile_.exists()); - */ - - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); - JUnitUtils.syncBuildProject(webProject,env_, null); - - } - - /** - * Set the persistent server runtime context preferences - */ - protected void initJ2EEWSRuntimeServerDefaults() throws Exception { - // Set default preferences for Axis and Tomcat 5.0 - JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50); - } - - /** - * Set the initial selection - */ - protected void initInitialSelection() throws Exception { - initialSelection_ = new StructuredSelection(sourceFile_); - } - - /** - * Launches the pop-up command to initiate the scenario - * @throws Exception - */ - public void testClientAxisTC50() throws Exception - { - IStatus status = Status.OK_STATUS; - - JUnitUtils.enableProxyGeneration(true); - JUnitUtils.enableOverwrite(true); - Performance perf= Performance.getDefault(); - PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this)); - try { - - performanceMeter.start(); - status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_); - performanceMeter.stop(); - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - } - finally { - performanceMeter.dispose(); - } - - if (status.getSeverity() == Status.OK) { - verifyOutput(); - } else { - throw new Exception(status.getException()); - } - - } - - /** - * Verify the scenario completed succesfully - * @throws Exception - */ - private final void verifyOutput() throws Exception { - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - - IPath destPath = ResourceUtils.getJavaSourceLocation(webProject); - IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath); - - //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME); - IFolder folder = srcFolder.getFolder("foo"); - assertTrue(folder.exists()); - assertTrue(folder.members().length > 0); - - //TODO Check that the client runs - - } - - /** - * Remove workspace if necessary - */ - protected void deleteInputData() throws Exception { - - // Delete the Web project. - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - webProject.delete(true,true, null); - - } - -} 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 deleted file mode 100644 index fc7d5e0d6..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java +++ /dev/null @@ -1,134 +0,0 @@ -package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test; -import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.jst.ws.tests.util.ScenarioConstants; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; - -/** - * Top down performance scenario with Axis and Tomcat v5.0 - */ -public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test { - - private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS; - - private final String PROJECT_NAME = WSJUnitConstants.TD_PROJECT_NAME; - - /*module name to be removed later */ - private final String WEB_MODULE_NAME = "TestTDWebModule"; - - private IFile sourceFile_; - - - /** - * Sets up the input data; - * - create project(s), - * - copy resources to workspace - */ - protected void installInputData() throws Exception { - - /* - // Create an associated Web project (TestWeb) targetted to Tomcat 5.0 - IStatus s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_, null); - if (s.getSeverity() != Status.OK) - throw new Exception(s.getException()); - - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - assertTrue(webProject.exists()); - - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - JUnitUtils.copyTestData("TDJava",destFolder,env_, null); - sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); - assertTrue(sourceFile_.exists()); - */ - - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); - JUnitUtils.syncBuildProject(webProject,env_, null); - } - - /** - * Set the persistent server runtime context preferences - */ - protected void initJ2EEWSRuntimeServerDefaults() throws Exception { - // Set default preferences for Axis and Tomcat v5.0 server - JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50); - } - - /** - * Set the initial selection - */ - protected void initInitialSelection() throws Exception { - initialSelection_ = new StructuredSelection(sourceFile_); - - } - - /** - * Launches the pop-up command to initiate the scenario - * @throws Exception - */ - public void testTDJavaAxisTC50() throws Exception { - - IStatus status = Status.OK_STATUS; - Performance perf= Performance.getDefault(); - PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this)); - try { - - performanceMeter.start(); - status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_); - performanceMeter.stop(); - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - } - finally { - performanceMeter.dispose(); - } - if (status.getSeverity() == Status.OK) - verifyOutput(); - else - throw new Exception(status.getException()); - - } - - /** - * Verify the scenario completed successfully - * @throws Exception - */ - private final void verifyOutput() throws Exception - { - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - - - IFolder wsdlFolder = webContentFolder.getFolder("wsdl"); - assertTrue(wsdlFolder.exists()); - assertTrue(wsdlFolder.members().length > 0); - - //TODO Verify that wsdd contains this Web service - //TODO Verify that the service can be invoked by a client - } - - /** - * Clear workspace if required - */ - protected void deleteInputData() throws Exception { - // Delete the Web project. - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - webProject.delete(true,true,null); - - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java deleted file mode 100644 index 17010224f..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.performance; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50; - -public class AllPerformanceTests { - public static Test suite() { - - // TODO: Create a test suite - TestSuite suite = new TestSuite("Test for org.eclipse.jst.ws.tests.performance"); - //$JUnit-BEGIN$ - suite.addTestSuite(PerfmsrBUJavaAxisTC50.class); - suite.addTestSuite(PerfmsrTDJavaAxisTC50.class); - suite.addTestSuite(PerfmsrClientAxisTC50.class); - //$JUnit-END$ - return suite; - } -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java deleted file mode 100644 index 31f60773a..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.eclipse.jst.ws.tests.performance.plugin; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class PerformancePlugin extends AbstractUIPlugin { - //The shared instance. - private static PerformancePlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public PerformancePlugin() { - super(); - plugin = this; - try { - resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.internal.test.performance.PerformancePlugin"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - } - - /** - * Returns the shared instance. - */ - public static PerformancePlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = PerformancePlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - return resourceBundle; - } -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java deleted file mode 100644 index f48f1a3a4..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.eclipse.jst.ws.tests.performance.util; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; -import org.eclipse.wst.common.environment.ILog; - - -public class EclipsePerformanceLog implements ILog { - - private boolean runState = false; - Performance perf = null; - PerformanceMeter performanceMeter= null; - - public boolean isEnabled() { - // TODO Auto-generated method stub - return false; - } - - public boolean isEnabled(String option) { - // TODO Auto-generated method stub - return false; - } - - public void log(int severity, int messageNum, Object caller, String method, Throwable throwable) { - // TODO Auto-generated method stub - - } - - public void log(int severity, String option, int messageNum, Object caller, String method, Throwable throwable) { - // TODO Auto-generated method stub - - } - - public void log(int severity, int messageNum, Object caller, String method, IStatus status) { - // TODO Auto-generated method stub - - } - - public void log(int severity, String option, int messageNum, Object caller, String method, IStatus status) { - // TODO Auto-generated method stub - - } - - public void log(int severity, int messageNum, Object caller, String method, Object object) { - // TODO Auto-generated method stub - - } - - public void log(int severity, String option, int messageNum, Object caller, String method, Object object) { - - if (method.equals("runCommand")) { - - try { - if (!runState) { - // begin performance recording - perf = Performance.getDefault(); - performanceMeter = perf.createPerformanceMeter(((String)object).toString()); - performanceMeter.start(); - runState = true; - } - else { - // end performance recording - performanceMeter.stop(); - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - performanceMeter.dispose(); - runState = false; - } - } - catch(Exception e) { - // handle exception - } - } - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java deleted file mode 100644 index 029a0a1cc..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.performance.util; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.tests.util.AccumulateStatusHandler; -import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; - - -public class PerformanceJUnitUtils { - - private static IStatus launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions(); - for (int i=0;i<extensions.length;i++) - { - if (extensions[i].getNamespace().equals(pluginNS)); - { - IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - for (int j=0;j<configElements.length;j++) - { - if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId)) - { - IConfigurationElement actionElement = configElements[j].getChildren()[0]; - AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(); - // Use this to enable per command performance measurements - //DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler, log); - DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler); - wizard.setInitializationData(actionElement,null,null); - wizard.selectionChanged(null,initialSelection); - wizard.run(null); - return statusHandler.getStatus(); - } - } - } - } - return StatusUtils.errorStatus( "No wizard found for: " ); - } - - public static IStatus launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection); - } - - public static IStatus launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection); - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/test.xml b/tests/org.eclipse.jst.ws.tests.performance/test.xml deleted file mode 100644 index 183b4ea2d..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/test.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="performance" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.jst.ws.tests.performance"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/> - <property name="workspace" value="${eclipse-home}/workspace_ws_performance"/> - <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <delete dir="${workspace}" quiet="true"/> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="performance_suite"> - - <!-- Iteration 1 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-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.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="${perf-tests-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="${perf-tests-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> - - <!-- Iteration 2 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-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.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="${perf-tests-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="${perf-tests-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> - - <!-- Iteration 3 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-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.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="${perf-tests-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="${perf-tests-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> - - <!-- Iteration 4 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-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.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="${perf-tests-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="${perf-tests-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> - - <!-- Iteration 5 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-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.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="${perf-tests-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="${perf-tests-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 --> - <!-- all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <delete dir="${workspace}" quiet="true"/> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="performance" depends="init,performance_suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.jst.ws.tests.performance*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project> diff --git a/tests/org.eclipse.jst.ws.tests/.classpath b/tests/org.eclipse.jst.ws.tests/.classpath deleted file mode 100644 index 9f4b4d1d5..000000000 --- a/tests/org.eclipse.jst.ws.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="tests"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.jst.ws.tests/.cvsignore b/tests/org.eclipse.jst.ws.tests/.cvsignore deleted file mode 100644 index 57763eb9b..000000000 --- a/tests/org.eclipse.jst.ws.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -tests.jar diff --git a/tests/org.eclipse.jst.ws.tests/.project b/tests/org.eclipse.jst.ws.tests/.project deleted file mode 100644 index fe80d54e4..000000000 --- a/tests/org.eclipse.jst.ws.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.ws.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF deleted file mode 100644 index e4701f25a..000000000 --- a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,36 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Java Web Services Tools Tests -Bundle-SymbolicName: org.eclipse.jst.ws.tests -Bundle-Version: 1.0.0 -Bundle-ClassPath: tests.jar -Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin -Bundle-Vendor: IBM -Bundle-Localization: plugin -Export-Package: org.eclipse.jst.ws.tests, - org.eclipse.jst.ws.tests.axis.tomcat.v50, - org.eclipse.jst.ws.tests.plugin, - org.eclipse.jst.ws.tests.unittest, - org.eclipse.jst.ws.tests.util -Require-Bundle: org.eclipse.jst.ws.consumption.ui, - org.eclipse.jst.ws.consumption, - org.eclipse.jst.ws, - org.eclipse.wst.command.env.core, - org.eclipse.wst.command.env.ui, - org.eclipse.wst.command.env, - org.eclipse.jst.j2ee.core, - org.eclipse.jst.j2ee, - org.eclipse.jst.j2ee.web, - org.eclipse.wst.common.frameworks, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.junit, - org.eclipse.wst.ws.ui, - org.eclipse.ui, - org.eclipse.debug.core, - org.eclipse.wst.server.core, - org.eclipse.jem.util, - org.eclipse.wst.ws, - org.eclipse.wst.common.environment, - org.eclipse.wst.common.tests -Eclipse-AutoStart: true diff --git a/tests/org.eclipse.jst.ws.tests/about.html b/tests/org.eclipse.jst.ws.tests/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.jst.ws.tests/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/build.properties b/tests/org.eclipse.jst.ws.tests/build.properties deleted file mode 100644 index f40af6da4..000000000 --- a/tests/org.eclipse.jst.ws.tests/build.properties +++ /dev/null @@ -1,11 +0,0 @@ -bin.includes = build.xml,\ - data/,\ - plugin.xml,\ - readme.txt,\ - tests.jar,\ - META-INF/,\ - test.xml,\ - about.html -jars.compile.order = tests.jar -source.tests.jar = tests/ -output.tests.jar = bin/ diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp b/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp deleted file mode 100644 index 7b0e3b344..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.io.*" %> -<jsp:useBean id="echoProxy" class="foo.EchoProxy" scope="request"/> -<html> -<%@ include file = "/outputFilePath.jspf" %> -<% - // HTTP/POST parameter: - // testInput - the String argument to call the proxy with. - String testInput = request.getParameter("testInput"); - - // Execute the Web service. - String result = echoProxy.echoString(testInput); - - // Write the result to the outputFilePath. - PrintWriter pw = null; - try - { - pw = new PrintWriter(new FileOutputStream(outputFilePath)); - pw.print(result); - pw.flush(); - } - catch (Exception e) - { - } - finally - { - if (pw != null) - pw.close(); - } -%> -</body> -<p> -testInput: <%=testInput%> -<p> -outputFilePath: <%=outputFilePath%> -<p> -The result is <%=result%> -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java b/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java deleted file mode 100644 index 4e893d2a5..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java +++ /dev/null @@ -1,9 +0,0 @@ -package foo; - -public class Echo -{ - public String echoString(String input) - { - return input; - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl b/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl deleted file mode 100644 index 46df32f3d..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://foo" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <wsdl:types> - <schema targetNamespace="http://foo" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <element name="echoStringResponse"> - <complexType> - <sequence> - <element name="echoStringReturn" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="echoString"> - <complexType> - <sequence> - <element name="input" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="echoStringResponse"> - - <wsdl:part element="impl:echoStringResponse" name="parameters"/> - - </wsdl:message> - - <wsdl:message name="echoStringRequest"> - - <wsdl:part element="impl:echoString" name="parameters"/> - - </wsdl:message> - - <wsdl:portType name="Echo"> - - <wsdl:operation name="echoString"> - - <wsdl:input message="impl:echoStringRequest" name="echoStringRequest"/> - - <wsdl:output message="impl:echoStringResponse" name="echoStringResponse"/> - - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="EchoSoapBinding" type="impl:Echo"> - - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - - <wsdl:operation name="echoString"> - - <wsdlsoap:operation soapAction=""/> - - <wsdl:input name="echoStringRequest"> - - <wsdlsoap:body use="literal"/> - - </wsdl:input> - - <wsdl:output name="echoStringResponse"> - - <wsdlsoap:body use="literal"/> - - </wsdl:output> - - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="EchoService"> - - <wsdl:port binding="impl:EchoSoapBinding" name="Echo"> - - <wsdlsoap:address location="http://localhost:9080/TestWeb/services/Echo"/> - - </wsdl:port> - - </wsdl:service> - -</wsdl:definitions> diff --git a/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip Binary files differdeleted file mode 100644 index f5d81f9d2..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip +++ /dev/null diff --git a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip Binary files differdeleted file mode 100644 index 8f2e9eb85..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip +++ /dev/null diff --git a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf b/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf deleted file mode 100644 index c8a7aec67..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf +++ /dev/null @@ -1,6 +0,0 @@ -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -</head> -<% - String outputFilePath = request.getParameter("outputFilePath"); -%>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/plugin.xml b/tests/org.eclipse.jst.ws.tests/plugin.xml deleted file mode 100644 index 7bf65fb5f..000000000 --- a/tests/org.eclipse.jst.ws.tests/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - -</plugin> diff --git a/tests/org.eclipse.jst.ws.tests/readme.txt b/tests/org.eclipse.jst.ws.tests/readme.txt deleted file mode 100644 index 832954656..000000000 --- a/tests/org.eclipse.jst.ws.tests/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -The arguments to be passed in are: - --Dorg.eclipse.jst.server.tomcat.50=E:\\Tomcat\\Tomcat5.0 - -, where "org.eclipse.jst.server.tomcat.50" is the install directory of your Tomcat v5.0 server. diff --git a/tests/org.eclipse.jst.ws.tests/test.xml b/tests/org.eclipse.jst.ws.tests/test.xml deleted file mode 100644 index 57e4c5833..000000000 --- a/tests/org.eclipse.jst.ws.tests/test.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.jst.ws.tests"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org*.xml"/> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="jst-ws-folder" value="${eclipse-home}/jst_ws_folder"/> - <delete dir="${jst-folder}" quiet="true"/> - <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${jst-ws-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.unittest.AllWSJUnitTests" /> - <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 --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project> diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java deleted file mode 100644 index 6425976f1..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java +++ /dev/null @@ -1,208 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests; - -import java.io.IOException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.tests.plugin.TestsPlugin; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IServer; - -public abstract class WSWizardTest extends TestCase implements WSJUnitConstants -{ - protected IEnvironment env_; - protected IRuntime serverRuntime_; - protected IServer server_; - protected IStructuredSelection initialSelection_; - - public String defaultURL_ = "http://localhost:8080/"; - - /** - * Set up the workspace for the Web Service Wizard JUnit test. Setup consists of the following steps: - * 1) Obtain an instance of the environment. - * 2) Install the server runtime. - * 3) Install the input data. This may include projects, source files etc. - * 4) Install an instance of the server if required. This may also include configuration of the input data on the server. - * 5) Initialize the J2EE, Web Service Runtime and Server type defaults for the Web Service wizard to use. - * 6) Initialize the initial selection object to set the context for the Web Service wizard. - * @throws Exception - */ - protected void setUp() throws Exception - { - // Get an instance of the default environment with the AccumulateStatusHandler to minimize UI dialog blocks. - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseStatusHandler handler = new EclipseStatusHandler(); - EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler ); - - env_ = environment; - assertTrue(env_ != null); - - server_ = null; - JUnitUtils.hideActionDialogs(); - installServerRuntime(); - installServer(); - - // unzip pre-configured workspace projects - if (!ProjectUtilities.getProject(WSJUnitConstants.BU_PROJECT_NAME).exists()) - createProjects(); - - installInputData(); - initJ2EEWSRuntimeServerDefaults(); - initInitialSelection(); - } - - /** - * Install the server runtime. - * @throws Exception - */ - protected abstract void installServerRuntime() throws Exception; - - /** - * Installs the input data from an aggregator. This ensures that the environment, runtime - * and server are correctly set on the aggregate since its lifecycle methods are not necessarily - * called. - * @param env - * @param serverRuntime - * @param server - * @throws Exception - */ - public void installInputData(IEnvironment env,IRuntime serverRuntime,IServer server) throws Exception - { - env_ = env; - serverRuntime_ = serverRuntime; - server_ = server; - //installInputData(); - } - - // Creates projects from the provided ZIP file. - public static boolean createProjects() { - IPath localZipPath = getLocalPath(); - ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, perf_projectNames); - return util.createProjects(); - } - - private static IPath getLocalPath() { - URL url = TestsPlugin.getDefault().find(perf_zipFilePath); - try { - url = Platform.asLocalURL(url); - } catch (IOException e) { - e.printStackTrace(); - } - return new Path(url.getPath()); - } - - /** - * Install the input data for the test. This may include projects, source files etc. - * @throws Exception - */ - protected abstract void installInputData() throws Exception; - - /** - * Install an instance of the server. This may also configure input data on the server. - * @throws Exception - */ - protected abstract void installServer() throws Exception; - - /** - * Initialize the J2EE level, Web Service runtime type and Server defaults for the test case. - * @throws Exception - */ - protected abstract void initJ2EEWSRuntimeServerDefaults() throws Exception; - - /** - * Initialize the initial selection which drives the Web Service wizard. This could include source Java files, - * WSDL URLs and even EJBs. - * @throws Exception - */ - protected abstract void initInitialSelection() throws Exception; - - /** - * Clean up the workspace. Cleanup consists of the following steps: - * 1) Delete the input data. This should include removal of configuration data on the server if necessary. - * 2) Stop the server. - * 3) Delete the server. - * 4) Delete the server runtime. - */ - protected void tearDown() throws Exception - { - stopServer(); -// deleteServer(); -// deleteInputData(); -// deleteServerRuntime(); - } - - /** - * Delete the input data. This should include removal of projects, src files etc. as well as removal of any server configured data. - * @throws Exception - */ - protected abstract void deleteInputData() throws Exception; - - /** - * Stop the server if it is running. - * @throws Exception - */ - protected void stopServer() throws Exception - { - if (server_ != null && server_.getServerState() == IServer.STATE_STARTED) - server_.stop(true); - assertTrue(server_.getServerState() == IServer.STATE_STOPPED); - } - - /** - * Delete the server. - * @throws Exception - */ - protected void deleteServer() throws Exception - { - if (server_ != null) - server_.delete(); - } - - /** - * Delete the server runtime. - * @throws Exception - */ - protected void deleteServerRuntime() throws Exception - { - if (serverRuntime_ != null) - serverRuntime_.delete(); - } - - /** - * Get the default URL in the form of: http://localhost:9080/<contextRoot>/<path> - * @param path - a file or URL relative path. - * @param contextRoot - the context root of the Web module for this URL. - * @return - */ - protected String getDefaultURL(String path,String contextRoot) - { - StringBuffer url = new StringBuffer(defaultURL_); - url.append(contextRoot); - url.append('/'); - url.append(path); - return url.toString(); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java deleted file mode 100644 index 87d78c297..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.axis.tomcat.v50; - -import org.eclipse.jst.ws.tests.WSWizardTest; -import org.eclipse.jst.ws.tests.util.JUnitUtils; - - -public abstract class WSWizardTomcat50Test extends WSWizardTest { - - protected final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50"); - protected final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - protected final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - - - /* (non-Javadoc) - * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServerRuntime() - */ - protected void installServerRuntime() throws Exception { - - serverRuntime_ = JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH); - } - - - /* (non-Javadoc) - * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServer() - */ - protected void installServer() throws Exception { - - server_ = JUnitUtils.createServer("Apache Tomcat v50", SERVERTYPEID_TC50, serverRuntime_, env_, null ); - } - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java deleted file mode 100644 index f76825569..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.plugin; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class TestsPlugin extends Plugin { - //The shared instance. - private static TestsPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public TestsPlugin() { - super(); - plugin = this; - try { - resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.tests.plugin.TestsPlugin"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - } - - /** - * Returns the shared instance. - */ - public static TestsPlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - return resourceBundle; - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java deleted file mode 100644 index dca872603..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; -import junit.textui.TestRunner; -import org.eclipse.jst.ws.tests.util.JUnitUtils; - -/** - * This class is to run all the unittest tests. - */ -public class AllWSJUnitTests extends TestCase implements WSJUnitConstants -{ - /** - * Method parseArgs. - * - * @param args - */ - private void parseArgs(Object args) - { - // typicially args is an array of strings, - // not sure when it wouldn't be. - } - - public static void main(String[] args) - { - new AllWSJUnitTests().runMain(args); - } - - - public Object runMain(Object args) - { - Object result = null; - try - { - TestRunner testRunner = null; - - parseArgs(args); - - testRunner = new TestRunner(System.out); - - Test suite = suite(); - TestResult testResult = testRunner.doRun(suite, false); - printHeader(testResult); - } - catch (Exception e) - { - result = e; - } - - return result; - } - - public static Test suite() - { - JUnitUtils.enableOverwrite(true); - - TestSuite testSuite = new TestSuite(); - testSuite.addTest( ComponentCreationTests.suite() ); - testSuite.addTest( J2EEUtilsTests.suite() ); - - String s = System.getProperty("org.eclipse.jst.server.tomcat.50"); - if (s != null && s.length() > 0) { - testSuite.addTest( ServerCreationTests.suite()); - } - testSuite.addTest( ResourceUtilsTests.suite() ); - - - return testSuite; - } - - /** - * Prints the header of the report - */ - protected void printHeader(TestResult result) - { - if (result.wasSuccessful()) - { - System.out.println(); - System.out.print("OK"); - System.out.println(" (" + result.runCount() + " tests)"); - - } - else - { - System.out.println(); - System.out.println("FAILURES!!!"); - System.out.println( - "Tests run: " - + result.runCount() - + ", Failures: " - + result.failureCount() - + ", Errors: " - + result.errorCount()); - } - } -} 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 deleted file mode 100644 index dbc014f09..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - * - */ -package org.eclipse.jst.ws.tests.unittest; - -import java.io.IOException; -import java.net.URL; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.tests.plugin.TestsPlugin; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -/** - * Tests the various Component creation commands - */ -public class ComponentCreationTests extends TestCase implements WSJUnitConstants { - - public static Test suite(){ - return new TestSuite(ComponentCreationTests.class); - } - - public void testWebComponentCreation(){ - - createServerRuntime(); - createProjects(); - //createWebModule(projectName, projectName, J2EEVersionConstants.J2EE_1_4_ID); - //createWebModule(project2Name, project2Name, J2EEVersionConstants.J2EE_1_3_ID); - - } - - // Creates projects from the provided ZIP file. - public static boolean createProjects() { - IPath localZipPath = getLocalPath(); - ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, projectNames); - return util.createProjects(); - } - - private static IPath getLocalPath() { - URL url = TestsPlugin.getDefault().find(zipFilePath); - try { - url = Platform.asLocalURL(url); - } catch (IOException e) { - e.printStackTrace(); - } - return new Path(url.getPath()); - } - - public void createServerRuntime(){ - - try { - JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH); - } - catch(Exception e){ - e.printStackTrace(); - } - - } - - private void createWebModule(String projectNm, String componentName, int j2eeVersion){ - - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(j2eeVersion).toString()); - cmc.setModuleName(componentName); - cmc.setModuleType(CreateModuleCommand.WEB); - cmc.setProjectName(projectNm); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null ); - - System.out.println("Done creating Web component..."+projectNm); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectNm); - IVirtualComponent vc = ComponentCore.createComponent(p); - assertTrue(vc.exists()); - - } - - public void dtestCreateEJBModule(){ - - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString()); - cmc.setModuleName(ejbComponentName); - cmc.setModuleType(CreateModuleCommand.EJB); - cmc.setProjectName(ejbProjectName); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null ); - - System.out.println("Done creating EJB component."); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(ejbProjectName); - IVirtualComponent vc = ComponentCore.createComponent(p); - assertTrue(vc.exists()); - } - - public void dtestCreateAppClientModule(){ - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString()); - cmc.setModuleName(appClientCompName); - cmc.setModuleType(CreateModuleCommand.APPCLIENT); - cmc.setProjectName(appClientProjectName); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null); - - System.out.println("Done creating App client component."); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(appClientProjectName); - IVirtualComponent vc = ComponentCore.createComponent(p); - assertTrue(vc.exists()); - } - - public void dtestCreateEARModule(){ - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString()); - cmc.setModuleName(earCompName); - cmc.setModuleType(CreateModuleCommand.EAR); - cmc.setProjectName(projectName); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null); - - System.out.println("Done creating EAR component."); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectName); - 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 deleted file mode 100644 index 18a135465..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java +++ /dev/null @@ -1,205 +0,0 @@ -/** - * - */ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -/** - * @author sengpl - * - */ -public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ - - private IProject project1 = null; - private IProject project2 = null; - private IProject ejbProject = null; - - private String comp1 = webComponentName; - - protected void setUp() throws Exception { - super.setUp(); - - // Project and component names initialized here! - project1 = ProjectUtilities.getProject(projectName); - assertNotNull(project1); - - project2 = ProjectUtilities.getProject(project2Name); - assertNotNull(project2); - - ejbProject = ProjectUtilities.getProject(ejbProjectName); - assertNotNull(ejbProject); - - } - - protected void tearDown() throws Exception { - super.tearDown(); - // TODO Clear the workspace - - } - - public static Test suite() - { - return new TestSuite(J2EEUtilsTests.class); - } - - public void testComponentsExist(){ - System.out.println("< BEGIN: testComponentExists ..."); - IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1); - IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName()); - - assertTrue(vc1.exists()); - assertTrue(J2EEUtils.exists(project1)); - assertTrue(vc2.exists()); - assertTrue(J2EEUtils.exists(project2.getName(), project2Name)); - System.out.println("< END: testComponentExists ..."); - } - - public void testLocationGetterMethods(){ - - System.out.println("< BEGIN: testLocationGetterMethods ..."); - 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); - 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); - 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); - IResource res4 = ResourceUtils.getWorkspaceRoot().findMember(container.getFullPath()); - assertEquals(res2, res4); - - System.out.println("< END: testLocationGetterMethods ..."); - - } - - public void testJ2EEVersionMethods(){ - - System.out.println("< BEGIN: testJ2EEVersionMethods ..."); - - String j3 = J2EEUtils.getJ2EEVersionAsString(project1); - System.out.println("J2EEVersion p1 as String: "+j3); - assertEquals(J2EEVersionConstants.VERSION_2_4_TEXT, j3); - - IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2); - int j2 = J2EEUtils.getJ2EEVersion(vc2); - System.out.println("J2EEVersions p1: "+j2); - assertEquals(J2EEVersionConstants.SERVLET_2_3, j2); - - System.out.println("< END: testJ2EEVersionMethods ..."); - } - - public void testComponentGetterMethods(){ - - System.out.println("< BEGIN: testComponentGetterMethods ..."); - - IVirtualComponent[] vcs = J2EEUtils.getAllComponents(); - checkVirtualComponentsExists(vcs); - - IVirtualComponent[] vcs2 = J2EEUtils.getAllEARComponents(); - checkVirtualComponentsExists(vcs2); - - IVirtualComponent[] vcs3 = J2EEUtils.getAllWebComponents(); - checkVirtualComponentsExists(vcs3); - - IVirtualComponent[] vcs4 = J2EEUtils.getWebComponents(project1); - checkVirtualComponentsExists(vcs4); - - String[] names = J2EEUtils.getWebComponentNames(project2); - printNameStrings(names); - - String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getComponentsByType(project1, J2EEUtils.WEB | J2EEUtils.EJB)); - printNameStrings(names2); - - IProject[] projects = J2EEUtils.getAllFlexibleProjects(); - for (int i=0;i<projects.length;i++){ - System.out.println("Flex project "+i+" = "+projects[i]); - } - - System.out.println("< END: testComponentGetterMethods ..."); - } - - private void checkVirtualComponentsExists(IVirtualComponent[] vcs){ - for (int i=0; i<vcs.length;i++){ - IVirtualComponent vc = vcs[i]; - System.out.println("VC: Project = "+vc.getProject()+" Name = "+vc.getName()); - assertTrue(vc.exists()); - - } - } - - private void printNameStrings(String[] names){ - for (int i=0;i<names.length;i++){ - System.out.println("Name"+i+" = "+names[i]); - } - } - - public void dtestAssociateComponentCommand(){ - - System.out.println("< BEGIN: testAssociateComponentCommand ..."); - - AssociateModuleWithEARCommand amwe = new AssociateModuleWithEARCommand(); - amwe.setEar(earCompName); - amwe.setEARProject(projectName); - amwe.setModule(comp1); - amwe.setProject(projectName); - amwe.execute(null, null); - - System.out.println("< END: testAssociateComponentCommand ..."); - } - - public void dtestReferencingGetterMethods(){ - - System.out.println("< BEGIN: testReferencingGetterMethods ..."); - - System.out.println("isComponentAssociated .."); - J2EEUtils.isComponentAssociated(project1, project1); - - String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1)); - printNameStrings(names); - String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2)); - printNameStrings(names2); - - String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1)); - printNameStrings(names3); - - System.out.println("< END: testReferencingGetterMethods ..."); - } - - public void dtestIsComponentMethods(){ - - System.out.println("< BEGIN: testIsComponentMethods ..."); - - //assertFalse(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/LaunchTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java deleted file mode 100644 index ec2f6aa5b..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import org.eclipse.core.runtime.IPlatformRunnable; - -/** - * Minimal app to run as Eclipse "application" - */ -public class LaunchTest implements IPlatformRunnable -{ - /** - * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object) - */ - public Object run(Object args) throws Exception - { - - Object result = new AllWSJUnitTests().runMain(args); - - if (result != null) - { - if (result instanceof Throwable) - { - ((Throwable) result).printStackTrace(); - } - else - { - System.out.println("tests didn't return 'ok'"); - } - return result; - } - else - return IPlatformRunnable.EXIT_OK; - } -} 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 deleted file mode 100644 index 54741035c..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -/** - * JUnit tests for selective ResourceUtils methods. Calls which return a simple String or rely on a IResource - * API need not be tested. The focus is mainly to exercise Component and Flexible project APIs. - * - */ -public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ - - - public static Test suite(){ - return new TestSuite(ResourceUtilsTests.class); - } - - public void testComponentType(){ - IProject project = ProjectUtilities.getProject(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); - IFolder folder = (IFolder)ResourceUtils.findResource(destPath); - try { - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseStatusHandler handler = new EclipseStatusHandler(); - EclipseEnvironment env = new EclipseEnvironment( null, resourceContext, handler ); - - IFile file = folder.getFile(new Path("foo/Echo.java")); - if (!file.exists()) { - JUnitUtils.copyTestData("BUJava/src", folder, env, null ); - } - } - catch (Exception ex){ - ex.printStackTrace(); - } - - IPath javaFilePath = folder.getFile(new Path("foo/Echo.java")).getFullPath(); - IVirtualComponent vc = ResourceUtils.getComponentOf(javaFilePath); - assertTrue(vc.exists()); - - - } - - public void testJavaSourceLocation(){ - IProject project = ProjectUtilities.getProject(projectName); - String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project).toString(); - System.out.println("Java source location = "+javaSourceLoc); - assertTrue(javaSourceLoc.endsWith("src")); - - // get all the JavaSourceLocations via the VirtualComponent - IVirtualComponent vc1 = ComponentCore.createComponent(project); - IVirtualComponent vc2 = ComponentCore.createComponent(project); - IVirtualComponent[] vcs = new IVirtualComponent[]{vc1, vc2}; - IPath[] paths = ResourceUtils.getAllJavaSourceLocations(vcs); - - // verify first folder exists - IPath path1 = (IPath)paths[0]; - IResource resource = ResourceUtils.findResource(path1); - if (resource.exists()){ - assertEquals(IResource.FOLDER, resource.getType()); - } - - // verify second folder exists - IPath path2 = (IPath)paths[1]; - IResource resource2 = ResourceUtils.findResource(path2); - if (resource2.exists()){ - assertEquals(IResource.FOLDER, resource2.getType()); - } - } - - public void testWebComponentServerRoot() { - IProject project = ProjectUtilities.getProject(projectName); - IFolder folder = ResourceUtils.getWebComponentServerRoot(project); - assertTrue(folder.exists()); - - } - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java deleted file mode 100644 index 12041b6ee..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * - */ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; - -public class ServerCreationTests extends TestCase implements WSJUnitConstants{ - - - public static Test suite(){ - return new TestSuite(ServerCreationTests.class); - } - - public void init(){ - try { - assertNotNull(SERVER_INSTALL_PATH); - JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH); - } - catch(Exception e){ - e.printStackTrace(); - } - } - - public void testCreateTomcatv5Server(){ - init(); - - System.out.println("Creating Tomcat v5 server."); - CreateServerCommand csc = new CreateServerCommand(); - csc.setServerFactoryid(SERVERTYPEID_TC50); - csc.execute(null, null ); - - IServer server = null; - String instId = csc.getServerInstanceId(); - System.out.println("Server instance Id = "+instId); - if (instId!=null){ - server = ServerCore.findServer(instId); - } - assertNotNull(server); - - System.out.println("Done creating Tomcat v5 server."); - } - - public void testReattemptCreateTomcatv5Server(){ - System.out.println("Attempting to create 2nd Tomcat v5 server."); - CreateServerCommand csc = new CreateServerCommand(); - csc.setServerFactoryid(SERVERTYPEID_TC50); - csc.execute(null, null ); - - IServer server = null; - String instId = csc.getServerInstanceId(); - if (instId!=null) { - server = ServerCore.findServer(instId); - } - assertNotNull(server); - - System.out.println("Done attempting 2nd Tomcat v5 server creation."); - } -} 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 deleted file mode 100644 index 9ba293bfa..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import org.eclipse.core.runtime.Path; - - -public interface WSJUnitConstants { - - public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50"); - public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - - public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11"; - - public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - - public final String webProjectName = "WebProject"; - - // flexible project structure 1 - public final String projectName = "FlexProject"; - public final String webComponentName = "webComponent"; - public final String webComponent2Name = "webComp2"; - - // flexible project structure 2 - public final String project2Name = "FlexProject2"; - public final String webComp3Name = "webComp3"; - public final String webComp4Name = "webComp4"; - - public final String ejbProjectName = "FlexEJBProject"; - public final String ejbComponentName = "ejbComponent"; - - public final String appClientProjectName = "FlexAppClientProject"; - public final String appClientCompName = "appClientComponent"; - - public final String earCompName = "EARComponent"; - - public final Path zipFilePath = new Path("/data/WSTestProjects.zip"); - public final String[] projectNames = new String[]{projectName, project2Name}; - - // performance constants - public final String BU_PROJECT_NAME = "TestWeb"; - public final String TD_PROJECT_NAME = "TestTDProject"; - public final String CLIENT_PROJECT_NAME = "TestWebClient"; - - public final Path perf_zipFilePath = new Path("/data/WSPerfProjects.zip"); - public final String[] perf_projectNames = new String[]{BU_PROJECT_NAME, TD_PROJECT_NAME, CLIENT_PROJECT_NAME}; - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java deleted file mode 100644 index 06b4540a7..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -import java.util.Vector; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Choice; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class AccumulateStatusHandler implements IStatusHandler { - Vector statusList_; - - public AccumulateStatusHandler() - { - resetStatus(); - } - - /** - * Resets the status so that it starts out empty again. - * - */ - public void resetStatus() - { - statusList_ = new Vector(); - } - - public IStatus getStatus() - { - IStatus worstStatus = Status.OK_STATUS; - - // Find the worst error status code - for( int index = 0; index < statusList_.size(); index++ ) - { - IStatus status = (IStatus)statusList_.elementAt( index ); - - if( status.getSeverity() > worstStatus.getSeverity() ) - { - worstStatus = status; - } - } - - return StatusUtils.multiStatus( worstStatus.getMessage(), - (IStatus[])statusList_.toArray( new IStatus[0] ) ); - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[]) - */ - public Choice report(IStatus status, Choice[] choices) - { - Choice result = null; - - // Always take the first choice if available. - if( choices != null && choices.length > 0 ) - { - result = choices[0]; - } - - statusList_.add( status ); - - return result; - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status) - */ - public void report(IStatus status) throws StatusException - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportError(com.ibm.env.common.Status) - */ - public void reportError(IStatus status) - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportInfo(com.ibm.env.common.Status) - */ - public void reportInfo(IStatus status) - { - statusList_.add( status ); - } - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java deleted file mode 100644 index d52cba00f..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager; -import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class DynamicPopupJUnitWizard extends DynamicPopupWizard { - private IStatusHandler handler_; - private ILog log_; - public DynamicPopupJUnitWizard(IStatusHandler handler) - { - handler_ = handler; - } - - public DynamicPopupJUnitWizard(IStatusHandler handler, ILog log) - { - handler_ = handler; - log_ = log; - } - - public void runHeadLess(IStructuredSelection selection,IRunnableContext context) { - - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler_ ); - if (log_!=null) - environment.setLog(log_); - - DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl(); - DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment ); - SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager); - - try - { - commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" ); - } - catch( CoreException exc ) - { - exc.printStackTrace(); - } - - commandWidgetBinding_.registerDataMappings( dataRegistry_ ); - - CommandFragment rootFragment = getRootFragment( selection, null ); - manager.setRootFragment( rootFragment ); - manager.runForwardToNextStop( context ); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java deleted file mode 100644 index 1ec8b4aee..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java +++ /dev/null @@ -1,358 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -import java.lang.reflect.InvocationTargetException; -import java.util.Enumeration; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.jst.ws.tests.plugin.TestsPlugin; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; -import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType; -import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IRuntimeType; -import org.eclipse.wst.server.core.IRuntimeWorkingCopy; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerType; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; - - -public class JUnitUtils { - // Begin Server Utilities - public static IRuntime createServerRuntime(String runtimeTypeId,String serverInstallPath) throws Exception - { - IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId); - IRuntimeWorkingCopy wc = rt.createRuntime("aRuntime", null); - wc.setLocation(new Path(serverInstallPath)); - - return wc.save(true, null); - } - - public static IServer createServer(String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - IServerType serverType = ServerCore.findServerType(serverTypeId); - IServer[] servers = ServerCore.getServers(); - for (int i=0;i<servers.length;i++){ - if(servers[i].getServerType().getId().equals(serverType.getId())){ - return servers[i]; - } - } - - IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor ); - serverWc.setName(name); - serverWc.setRuntime(runtime); - IServer server = serverWc.saveAll(true, monitor ); - return server; - } - - /** - * createServer and install JRE for Servers requiring a specific JRE - * @param javaRuntimePath JRE install location; i.e. E:\\Java141 - * @param jreID JRE id; i.e. java141 - * @param name server name - * @param serverTypeId server type id - * @param runtime IRuntime - * @param env IEnvironment - * @return server IServer - * @throws Exception - * - * @deprecated - */ - public static IServer createServer(String javaRuntimePath, String jreID, String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - IServerType serverType = ServerCore.findServerType(serverTypeId); - IServer[] servers = ServerCore.getServers(); - for (int i=0;i<servers.length;i++){ - if(servers[i].getServerType().getId().equals(serverType.getId())){ - return servers[i]; - } - } - - IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor ); - serverWc.setName(name); - serverWc.setRuntime(runtime); - - IServer server = serverWc.saveAll(true, monitor ); - - return server; - } - - public static void startServer(IServer server,IEnvironment env) throws Exception - { - final IServer currentServer = server; - IRunnableWithProgress runnable = new IRunnableWithProgress() - { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - try - { - currentServer.start(ILaunchManager.RUN_MODE, monitor ); - } - catch (CoreException e) - { - InterruptedException wrapper = new InterruptedException(e.getMessage()); - wrapper.setStackTrace(e.getStackTrace()); - throw wrapper; - } - } - }; - PlatformUI.getWorkbench().getProgressService().run(true,false,runnable); - } - - public static boolean removeEARFromServer(IServer server,IProject earProject,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - int numberOfModules = server.getModules().length; - if (server != null) - { - final IModule earProjectModule = ServerUtil.getModule(earProject); - final IModule[] modules = {earProjectModule}; - new ServerUtils().modifyModules(env, server,earProjectModule,false, monitor ); - final IServer currentServer = server; - IRunnableWithProgress runnable = new IRunnableWithProgress() - { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - for (int i=0;i<1000;i++) - { - int moduleState = currentServer.getModuleState(modules); - if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING) - { - try - { - Thread.sleep(300); - } - catch (InterruptedException e) - { - e.printStackTrace(System.err); - } - } - else - break; - } - } - }; - PlatformUI.getWorkbench().getProgressService().run(true,false,runnable); - return (server.getModules().length == (numberOfModules-1)); - } - return false; - } - - public static boolean removeModuleFromServer(IServer server, IProject webProject, IEnvironment env, IProgressMonitor monitor ) throws Exception { - - int numberOfModules = server.getModules().length; - if (server != null) - { - final IModule webProjectModule = ServerUtil.getModule(webProject); - final IModule[] modules = {webProjectModule}; - - new ServerUtils().modifyModules(env, server,webProjectModule,false, monitor ); - final IServer currentServer = server; - IRunnableWithProgress runnable = new IRunnableWithProgress() - { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - for (int i=0;i<1000;i++) - { - int moduleState = currentServer.getModuleState(modules); - if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING) - { - try - { - Thread.sleep(300); - } - catch (InterruptedException e) - { - e.printStackTrace(System.err); - } - } - else - break; - } - } - }; - PlatformUI.getWorkbench().getProgressService().run(true,false,runnable); - //Thread.sleep(6000); - return (server.getModules().length == (numberOfModules-1)); - } - return false; - } - - // Begin: General Eclipse Utilities - - public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - project.build(IncrementalProjectBuilder.FULL_BUILD, monitor ); - WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand(); - cmd.setEnvironment( env ); - cmd.execute( monitor, null ); - } - - private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString); - while (e.hasMoreElements()) - { - String filePath = (String)e.nextElement(); - if (filePath.endsWith("/")) - copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor ); - else - { - IPath fileIPath = new Path(filePath); - FileResourceUtils.copyFile(EnvironmentUtils.getResourceContext(env), - TestsPlugin.getDefault(), - fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir> - (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir> - destFolder.getFullPath(), - monitor, - env.getStatusHandler()); - } - } - } - - public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - String pathString = "/data/"+dataSubdirectory; - copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor); - - } - - // Begin: Web Services Utilities - public static void hideActionDialogs() - { - PersistentActionDialogsContext actionDialogsCtx = PersistentActionDialogsContext.getInstance(); - ActionDialogPreferenceType[] actionDialogPrefs = actionDialogsCtx.getDialogs(); - for (int i=0;i<actionDialogPrefs.length;i++) - actionDialogsCtx.setActionDialogEnabled(actionDialogPrefs[i].getId(),true); - } - - - public static boolean enableProxyGeneration(boolean enable) - { - ScenarioContext ctx = WebServicePlugin.getInstance().getScenarioContext(); - boolean previousSetting = ctx.getGenerateProxy(); - ctx.setGenerateProxy(enable); - return previousSetting; - } - - public static boolean enableOverwrite(boolean enable) - { - ResourceContext ctx = WebServicePlugin.getInstance().getResourceContext(); - boolean previousSetting = ctx.isOverwriteFilesEnabled(); - ctx.setOverwriteFilesEnabled(enable); - return previousSetting; - } - - public static void disableWSIDialog(IProject project){ - - PersistentWSIContext ctx = WSPlugin.getInstance().getWSIAPContext(); - ctx.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI); - - PersistentWSIContext ctx2 = WSPlugin.getInstance().getWSISSBPContext(); - ctx2.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI); - - } - - public static void setWSRuntimeServer(String wsRuntimeId,String serverTypeId) - { - PersistentServerRuntimeContext serverRuntimeCtx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext(); - serverRuntimeCtx.setRuntimeId(wsRuntimeId); - serverRuntimeCtx.setServerFactoryId(serverTypeId); - } - - private static IStatus launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions(); - for (int i=0;i<extensions.length;i++) - { - if (extensions[i].getNamespace().equals(pluginNS)); - { - IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - for (int j=0;j<configElements.length;j++) - { - if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId)) - { - IConfigurationElement actionElement = configElements[j].getChildren()[0]; - AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(); - DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler); - wizard.setInitializationData(actionElement,null,null); - wizard.selectionChanged(null,initialSelection); - wizard.run(null); - return statusHandler.getStatus(); - } - } - } - } - return StatusUtils.errorStatus( "No wizard found for: " ); - } - - public static IStatus launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection); - } - - public static IStatus launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection); - } - - public static IStatus createWebModule(String webProjectName, String moduleName, String serverFactoryId, String j2eeVersion, IEnvironment env, IProgressMonitor monitor ){ - - IStatus status = Status.OK_STATUS; - try{ - CreateModuleCommand createWeb = new CreateModuleCommand(); - createWeb.setProjectName(webProjectName); - createWeb.setModuleName(moduleName); - createWeb.setModuleType(CreateModuleCommand.WEB); - createWeb.setJ2eeLevel(j2eeVersion); - createWeb.setServerFactoryId(serverFactoryId); - createWeb.setEnvironment( env ); - return createWeb.execute( monitor, null ); - } - catch (Exception e){ - status = StatusUtils.errorStatus( e ); - } - return status; - - } - -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java deleted file mode 100644 index 4217d82e0..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -public class ScenarioConstants { - // Bottom up Java or EJB to Web Service wizard ID. - public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java"; - - // Top down WSDL to Skeleton Web Service wizard ID. - public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton"; - - // Web Service client wizard ID. - public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard"; - - // Object class for: - // 1) Java source (bottom-up) - // 2) WSDL or WSIL (top-down or client). - public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile"; - - // Object class for Java compilation units (i.e. Java classes selected in the Java perspective). - public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit"; - - // Object class for a service selected in the J2EE perspective (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service"; - - // Object class for a WSDLResourceImpl (top-down or client). - public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl"; - - // Object class for a ServiceRef (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"; - - // Object class for a ServiceImplBean (bottom-up). - public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"; - - // Object class for a BeanLink (bottom-up). - public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"; -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/.classpath b/tests/org.eclipse.wst.ws.tests/.classpath deleted file mode 100644 index 9f4b4d1d5..000000000 --- a/tests/org.eclipse.wst.ws.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="tests"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.ws.tests/.cvsignore b/tests/org.eclipse.wst.ws.tests/.cvsignore deleted file mode 100644 index 57763eb9b..000000000 --- a/tests/org.eclipse.wst.ws.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -tests.jar diff --git a/tests/org.eclipse.wst.ws.tests/.project b/tests/org.eclipse.wst.ws.tests/.project deleted file mode 100644 index 55f2bcd81..000000000 --- a/tests/org.eclipse.wst.ws.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.ws.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 2587a943a..000000000 --- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Tests Plug-in -Bundle-SymbolicName: org.eclipse.wst.ws.tests -Bundle-Version: 1.0.0 -Bundle-Activator: org.eclipse.wst.ws.tests.plugin.TestsPlugin -Bundle-Localization: plugin -Require-Bundle: org.eclipse.wst.ws, - org.eclipse.core.runtime, - org.junit, - org.eclipse.core.resources, - org.eclipse.debug.core, - org.eclipse.jem.util, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.wst.command.env, - org.eclipse.wst.command.env.core, - org.eclipse.wst.common.frameworks, - org.eclipse.wst.server.core, - org.eclipse.wst.ws.ui, - org.eclipse.wst.command.env.ui, - org.eclipse.wst.common.environment -Eclipse-AutoStart: true -Export-Package: org.eclipse.wst.ws.tests.plugin, - org.eclipse.wst.ws.tests.unittest, - org.eclipse.wst.ws.tests.util -Bundle-ClassPath: tests.jar diff --git a/tests/org.eclipse.wst.ws.tests/about.html b/tests/org.eclipse.wst.ws.tests/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.ws.tests/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/build.properties b/tests/org.eclipse.wst.ws.tests/build.properties deleted file mode 100644 index f40af6da4..000000000 --- a/tests/org.eclipse.wst.ws.tests/build.properties +++ /dev/null @@ -1,11 +0,0 @@ -bin.includes = build.xml,\ - data/,\ - plugin.xml,\ - readme.txt,\ - tests.jar,\ - META-INF/,\ - test.xml,\ - about.html -jars.compile.order = tests.jar -source.tests.jar = tests/ -output.tests.jar = bin/ diff --git a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl b/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl deleted file mode 100644 index 0bd31ca44..000000000 --- a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/AreaService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="AreaService" targetNamespace="http://tempuri.org/AreaService/"> - <wsdl:types> - <xsd:schema targetNamespace="http://tempuri.org/AreaService/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="area" type="xsd:float"/> - <xsd:element name="parameters" type="tns:dimensions"/> - <xsd:complexType name="dimensions"> - <xsd:sequence> - <xsd:element name="width" type="xsd:float"></xsd:element> - <xsd:element name="height" type="xsd:float"></xsd:element> - </xsd:sequence> - </xsd:complexType> - - </xsd:schema> - </wsdl:types> - <wsdl:message name="CalculateRectAreaResponse"> - <wsdl:part element="tns:area" name="area"/> - </wsdl:message> - <wsdl:message name="CalculateRectAreaRequest"> - <wsdl:part element="tns:parameters" name="parameters"/> - </wsdl:message> - <wsdl:portType name="AreaService"> - <wsdl:operation name="CalculateRectArea"> - <wsdl:input message="tns:CalculateRectAreaRequest"/> - <wsdl:output message="tns:CalculateRectAreaResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AreaServiceSOAP" type="tns:AreaService"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="CalculateRectArea"> - <soap:operation soapAction="http://tempuri.org/AreaService/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AreaService"> - <wsdl:port binding="tns:AreaServiceSOAP" name="AreaServiceSOAP"> - <soap:address location="http://tempuri.org"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.ws.tests/plugin.xml b/tests/org.eclipse.wst.ws.tests/plugin.xml deleted file mode 100644 index 8c7e48a06..000000000 --- a/tests/org.eclipse.wst.ws.tests/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> - -<plugin> - -</plugin> diff --git a/tests/org.eclipse.wst.ws.tests/readme.txt b/tests/org.eclipse.wst.ws.tests/readme.txt deleted file mode 100644 index 91de03792..000000000 --- a/tests/org.eclipse.wst.ws.tests/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Currently no arguments to be passed in. See org.eclipse.jst.ws.tests for adding -arguments when running test suite (i.e. server install location...) diff --git a/tests/org.eclipse.wst.ws.tests/test.xml b/tests/org.eclipse.wst.ws.tests/test.xml deleted file mode 100644 index f291ace0f..000000000 --- a/tests/org.eclipse.wst.ws.tests/test.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.ws.tests"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <!-- commented for now until such a time as we need to call a server for wst tests --> - <!--<property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> --> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org*.xml"/> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="wst-ws-folder" value="${eclipse-home}/wst_ws_folder"/> - <delete dir="${wst-folder}" quiet="true"/> - <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${wst-ws-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.ws.tests.unittest.AllWSJUnitTests" /> - <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 --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project> diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java deleted file mode 100644 index f455fa9c3..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.eclipse.wst.ws.tests.data; - -import java.io.IOException; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.intro.IIntroManager; -import org.eclipse.ui.intro.IIntroPart; -import org.eclipse.wst.ws.tests.plugin.TestsPlugin; - -/** - * @author joan - * Sets up locator test data - uses same data file but renames it for each use - * Workspace structure created looks like this: - * - * root - * --project1 - * |----folder1 - * |-----folder2 - * |------one.wsdl - * |-----two.wsdl - * |----folder3 - * |-----three.wsdl - * |-----four.wsdl - * --project2 - * |----five.wsdl - * |----folder4 - * |----folder5 - * |-----six.wsdl - * --project3 - * |----one.xml - */ - -public class LocatorWorkspaceSetup extends TestCase { - - public static String PROJECT1_NAME = "Project1"; - public static String FOLDER1_NAME = "Folder1"; //contains WSDL file and one folder - public static String FOLDER2_NAME = "Folder2"; //nested in folder 1 and contains WSDL file - public static String FOLDER3_NAME = "Folder3"; //contains two WSDL files - public static String PROJECT2_NAME = "Project2"; //contains WSDL file and two folders - public static String FOLDER4_NAME = "Folder4"; //contains no WSDL - public static String FOLDER5_NAME = "Folder5"; //contains one WSDL file - public static String PROJECT3_NAME = "Project3"; //contains no WSDL files but one XML file - - public static String WSDLFILE_ONE = "one.wsdl"; - public static String WSDLFILE_TWO = "two.wsdl"; - public static String WSDLFILE_THREE = "three.wsdl"; - public static String WSDLFILE_FOUR = "four.wsdl"; - public static String WSDLFILE_FIVE = "five.wsdl"; - public static String WSDLFILE_SIX = "six.wsdl"; - public static String XMLFILE_ONE = "one.XML"; - - public static String ACTUAL_TESTFILEPATH = "data/locator/test.wsdl"; - - private IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - - public static Test suite() - { - return new TestSuite(LocatorWorkspaceSetup.class, "LocatorWorkspaceSetup"); - } - - protected void closeIntro() - { - IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager(); - IIntroPart introPart = introManager.getIntro(); - if (introPart != null) - introManager.closeIntro(introPart); - } - - protected IProject createSimpleProject(String name) throws CoreException - { - IProject simpleProject = root.getProject(name); - simpleProject.create(null); - simpleProject.open(null); - return simpleProject; - } - - protected IFolder createFolder(IContainer parent, String folderName) throws CoreException - { - IFolder folder1 = parent.getFolder(new Path(folderName)); - folder1.create(false, true, null); - return folder1; - } - - - protected void copyFile(IContainer project, String source, String dest) throws IOException, CoreException - { - - IFile file = project.getFile(new Path(dest)); - file.create(TestsPlugin.getDefault().getBundle().getEntry(source).openStream(), true, null); - Assert.assertTrue(file.exists()); - } - - protected void joinAutoBuild() throws CoreException - { - boolean interrupted = true; - while (interrupted) - { - try - { - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); - interrupted = false; - } - catch (InterruptedException e) - { - interrupted = true; - } - } - } - - public void testSetup() throws Exception - { - try{ - System.out.println("------ locator data setup starting"); - closeIntro(); - - IProject project1 = createSimpleProject(PROJECT1_NAME); - IFolder folder1 = createFolder(project1, FOLDER1_NAME); - copyFile(folder1, ACTUAL_TESTFILEPATH, WSDLFILE_TWO); - IFolder folder2 = createFolder(folder1, FOLDER2_NAME); - copyFile(folder2, ACTUAL_TESTFILEPATH, WSDLFILE_ONE); - IFolder folder3 = createFolder(project1, FOLDER3_NAME); - copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_THREE); - copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_FOUR); - - IProject project2 = createSimpleProject(PROJECT2_NAME); - copyFile(project2, ACTUAL_TESTFILEPATH, WSDLFILE_FIVE); - createFolder(project2, FOLDER4_NAME); //folder with no content - IFolder folder5 = createFolder(project2, FOLDER5_NAME); - copyFile(folder5, ACTUAL_TESTFILEPATH, WSDLFILE_SIX); - IProject project3 = createSimpleProject(PROJECT3_NAME); - copyFile(project3, ACTUAL_TESTFILEPATH, XMLFILE_ONE); - } - catch (Exception e) - { - e.printStackTrace(); - } - - //code to check workspace set up - debug - /*DataResourceVisitor visitor = new DataResourceVisitor(); - root.accept(visitor); - visitor.visit(root);*/ - - System.out.println("------ locator data setup complete"); - } - - protected class DataResourceVisitor implements IResourceVisitor - { - public boolean visit(IResource resource) throws CoreException { - if ((resource instanceof IProject) || (resource instanceof IFolder)) - { - System.out.println("visiting " + resource.getName()); - } - else if (resource instanceof IFile) - { - System.out.println("found file " + resource.getName()); - } - return true; - } - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java deleted file mode 100644 index da56b67d2..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.eclipse.wst.ws.tests.plugin; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class TestsPlugin extends Plugin { - //The shared instance. - private static TestsPlugin plugin; - - /** - * The constructor. - */ - public TestsPlugin() { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - } - - /** - * Returns the shared instance. - */ - public static TestsPlugin getDefault() { - return plugin; - } - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java deleted file mode 100644 index c4baf9f2e..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import org.eclipse.wst.ws.tests.data.LocatorWorkspaceSetup; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - -/** - * This class is to run all the unittest tests. - */ -public class AllWSJUnitTests extends TestCase -{ - /** - * Method parseArgs. - * - * @param args - */ - private void parseArgs(Object args) - { - // typicially args is an array of strings, - // not sure when it wouldn't be. - } - - public static void main(String[] args) - { - new AllWSJUnitTests().runMain(args); - } - - public Object runMain(Object args) - { - Object result = null; - try - { - TestRunner testRunner = null; - - parseArgs(args); - - testRunner = new TestRunner(System.out); - - - Test suite = suite(); - TestResult testResult = testRunner.doRun(suite, false); - printHeader(testResult); - } - catch (Exception e) - { - result = e; - } - - return result; - } - - public static Test suite() - { - TestSuite testSuite = new TestSuite(); - //add unit tests to suite here... - testSuite.addTest( LocatorWorkspaceSetup.suite()); - testSuite.addTest( WebServiceFinderTests.suite()); - return testSuite; - } - - /** - * Prints the header of the report - */ - protected void printHeader(TestResult result) - { - if (result.wasSuccessful()) - { - System.out.println(); - System.out.print("OK"); - System.out.println(" (" + result.runCount() + " tests)"); - - } - else - { - System.out.println(); - System.out.println("FAILURES!!!"); - System.out.println( - "Tests run: " - + result.runCount() - + ", Failures: " - + result.failureCount() - + ", Errors: " - + result.errorCount()); - } - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java deleted file mode 100644 index 3a6efe7b2..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import org.eclipse.core.runtime.IPlatformRunnable; - -/** - * Minimal app to run as Eclipse "application" - */ -public class LaunchTest implements IPlatformRunnable -{ - /** - * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object) - */ - public Object run(Object args) throws Exception - { - - Object result = new AllWSJUnitTests().runMain(args); - - if (result != null) - { - if (result instanceof Throwable) - { - ((Throwable) result).printStackTrace(); - } - else - { - System.out.println("tests didn't return 'ok'"); - } - return result; - } - else - return IPlatformRunnable.EXIT_OK; - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java deleted file mode 100644 index 084d082cb..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author sengpl - * - */ -public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ - - - public static Test suite(){ - return new TestSuite(ResourceUtilsTests.class); - } - - - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java deleted file mode 100644 index fce5ff980..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - - -public interface WSJUnitConstants { - - public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50"); - public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - - public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11"; - - public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - - public final String webProjectName = "WP"; - public final String webProject2Name = "WP2"; - 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 ejbComponentName = "ejbComponent"; - - public final String appClientProjectName = "AppClientProject"; - public final String appClientCompName = "appClientComponent"; - - public final String earCompName = "EARComponent"; - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java deleted file mode 100644 index 86f9c5cab..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import java.util.Iterator; - -import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder; -import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author joan - * - */ - -public class WebServiceFinderTests extends TestCase implements WSJUnitConstants { - - public static Test suite(){ - return new TestSuite(WebServiceFinderTests.class); - } - - public void testWSFinder(){ - System.out.println("creating web service finder"); - WebServiceFinder wsf = WebServiceFinder.instance(); - - System.out.println("attempting to locate all web services in workspace"); - Iterator wsIterator = wsf.getWebServices(); - while (wsIterator.hasNext()) { - WebServiceInfo wsInfo = (WebServiceInfo) wsIterator.next(); - System.out.println("webService URL: " + wsInfo.getWsdlURL()); - } - - System.out.println("finished finding all webservices"); - - } - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java deleted file mode 100644 index 8f524fb4b..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.tests.util; - -import java.util.Vector; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Choice; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class AccumulateStatusHandler implements IStatusHandler { - Vector statusList_; - - public AccumulateStatusHandler() - { - resetStatus(); - } - - /** - * Resets the status so that it starts out empty again. - * - */ - public void resetStatus() - { - statusList_ = new Vector(); - } - - public IStatus getStatus() - { - IStatus worstStatus = Status.OK_STATUS; - - // Find the worst error status code - for( int index = 0; index < statusList_.size(); index++ ) - { - IStatus status = (IStatus)statusList_.elementAt( index ); - - if( status.getSeverity() > worstStatus.getSeverity() ) - { - worstStatus = status; - } - } - - return StatusUtils.multiStatus( worstStatus.getMessage(), - (Status[])statusList_.toArray( new Status[0] ) ); - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[]) - */ - public Choice report(IStatus status, Choice[] choices) - { - Choice result = null; - - // Always take the first choice if available. - if( choices != null && choices.length > 0 ) - { - result = choices[0]; - } - - statusList_.add( status ); - - return result; - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status) - */ - public void report(IStatus status) throws StatusException - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportError(com.ibm.env.common.Status) - */ - public void reportError(IStatus status) - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportInfo(com.ibm.env.common.Status) - */ - public void reportInfo(IStatus status) - { - statusList_.add( status ); - } - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java deleted file mode 100644 index 2feea5381..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.tests.util; - -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager; -import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class DynamicPopupJUnitWizard extends DynamicPopupWizard { - private IStatusHandler handler_; - public DynamicPopupJUnitWizard(IStatusHandler handler) - { - handler_ = handler; - } - public void runHeadLess(IStructuredSelection selection,IRunnableContext context) { - CommandFragment rootFragment = getRootFragment( selection, null ); - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler_ ); - - DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl(); - DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment ); - SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager); - - commandWidgetBinding_.registerDataMappings( dataRegistry_ ); - manager.setRootFragment( rootFragment ); - manager.runForwardToNextStop( context ); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java deleted file mode 100644 index e5dbe7b03..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.tests.util; - -import java.util.Enumeration; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; -import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.tests.plugin.TestsPlugin; - - -public class JUnitUtils { - - // Begin: General Eclipse Utilities - public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - project.build(IncrementalProjectBuilder.FULL_BUILD,null); - WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand(); - cmd.setEnvironment( env ); - cmd.execute( monitor, null ); - } - - private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString); - while (e.hasMoreElements()) - { - String filePath = (String)e.nextElement(); - if (filePath.endsWith("/")) - copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor ); - else - { - IPath fileIPath = new Path(filePath); - FileResourceUtils.copyFile(new TransientResourceContext(), - TestsPlugin.getDefault(), - fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir> - (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir> - destFolder.getFullPath(), - monitor, - env.getStatusHandler()); - } - } - } - - public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - String pathString = "/data/"+dataSubdirectory; - copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor ); - - } - -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java deleted file mode 100644 index 3a894b631..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.tests.util; - -public class ScenarioConstants { - // Bottom up Java or EJB to Web Service wizard ID. - public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java"; - - // Top down WSDL to Skeleton Web Service wizard ID. - public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton"; - - // Web Service client wizard ID. - public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard"; - - // Object class for: - // 1) Java source (bottom-up) - // 2) WSDL or WSIL (top-down or client). - public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile"; - - // Object class for Java compilation units (i.e. Java classes selected in the Java perspective). - public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit"; - - // Object class for a service selected in the J2EE perspective (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service"; - - // Object class for a WSDLResourceImpl (top-down or client). - public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl"; - - // Object class for a ServiceRef (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"; - - // Object class for a ServiceImplBean (bottom-up). - public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"; - - // Object class for a BeanLink (bottom-up). - public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"; -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/.classpath b/tests/org.eclipse.wst.wsdl.tests.performance/.classpath deleted file mode 100644 index ce61870e7..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="performance"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore b/tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore deleted file mode 100644 index ba2fda950..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -build.xml - -temp.folder -performance.jar diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/.project b/tests/org.eclipse.wst.wsdl.tests.performance/.project deleted file mode 100644 index 6c6e861d3..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.wsdl.tests.performance</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/about.html b/tests/org.eclipse.wst.wsdl.tests.performance/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/build.properties b/tests/org.eclipse.wst.wsdl.tests.performance/build.properties deleted file mode 100644 index 5798e428d..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -source.performance.jar = performance/ -output.performance.jar = bin/ -bin.includes = plugin.xml,\ - performance.jar,\ - test.xml,\ - data/,\ - about.html -src.includes = build.properties diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl deleted file mode 100644 index 80bf96545..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/data/StockQuote/StockQuote.wsdl +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/StockQuote/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="StockQuote" targetNamespace="http://tempuri.org/StockQuote/">
- <wsdl:types>
- <xsd:schema targetNamespace="http://tempuri.org/StockQuote/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="getQuoteResponse">
- <xsd:complexType>
- <xsd:all>
- <xsd:element name="tickerSymbol" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getQuoteRequest">
- <xsd:complexType>
- <xsd:all>
- <xsd:element name="price" type="xsd:float"/>
- </xsd:all>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="Headers">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="header" minOccurs="0" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="name" type="xsd:string"/>
- <xsd:element name="value" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="getQuoteResponse">
- <wsdl:part element="tns:getQuoteResponse" name="getQuoteResponse"/>
- <wsdl:part element="tns:Headers" name="headers"/>
- </wsdl:message>
- <wsdl:message name="getQuoteRequest">
- <wsdl:part element="tns:getQuoteRequest" name="getQuoteRequest"/>
- <wsdl:part element="tns:Headers" name="headers"/>
- </wsdl:message>
- <wsdl:portType name="StockQuote">
- <wsdl:operation name="getQuote">
- <wsdl:input message="tns:getQuoteRequest"/>
- <wsdl:output message="tns:getQuoteResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="StockQuoteSOAP" type="tns:StockQuote">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getQuote">
- <soap:operation soapAction="http://tempuri.org/StockQuote/getQuote"/>
- <wsdl:input>
- <soap:body parts="getQuoteRequest" use="literal"/>
- <soap:header message="tns:getQuoteRequest" part="headers" use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body parts="getQuoteResponse" use="literal"/>
- <soap:header message="tns:getQuoteResponse" part="headers" use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="StockQuote">
- <wsdl:port binding="tns:StockQuoteSOAP" name="StockQuoteSOAP">
- <soap:address location="http://tempuri.org"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java deleted file mode 100644 index ffb64a02e..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/AllTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AllTests -{ - public static Test suite() - { - TestSuite suite = new TestSuite("Test for org.eclipse.wst.wsdl.tests.performance"); - //$JUnit-BEGIN$ - suite.addTestSuite(ReadStockQuoteWSDLTestCase.class); - suite.addTestSuite(ReadStockQuoteWSDLEMFTestCase.class); - suite.addTestSuite(ValidateStockQuoteWSDLTestCase.class); - suite.addTestSuite(ValidateStockQuoteWSITestCase.class); - suite.addTestSuite(OpenStockQuoteWSDLSetup.class); - suite.addTestSuite(OpenStockQuoteWSDLTestCase.class); - //$JUnit-END$ - return suite; - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java deleted file mode 100644 index 351fd3cfd..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.eclipse.wst.wsdl.tests.performance; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import javax.wsdl.WSDLException; -import junit.framework.Assert; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceProxy; -import org.eclipse.core.resources.IResourceProxyVisitor; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.swt.widgets.Display; -import org.eclipse.test.performance.Dimension; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; - -public class OpenEditorOAGISWSDLTestcase extends PerformanceTestCase -{ - private final String ID_WSDL_EDITOR = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor"; - - public void testReadWSDL() throws MalformedURLException, WSDLException, CoreException, FileNotFoundException - { - String oagis80Dir = System.getProperty("oagis80Dir"); - Assert.assertNotNull(oagis80Dir); - if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\")) - oagis80Dir = oagis80Dir + "/"; - File dir = new File(oagis80Dir + "OAGIS8.0"); - if (dir.exists() && dir.isDirectory()) - { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("sp"); - project.create(null); - project.open(null); - copy(dir, project); - joinBackgroundJobs(); - final List wsdls = new ArrayList(); - project.accept - ( - new IResourceProxyVisitor() - { - public boolean visit(IResourceProxy proxy) throws CoreException - { - if (proxy.getName().endsWith(".wsdl")) - { - wsdls.add(proxy.requestResource()); - } - return true; - } - }, - IContainer.INCLUDE_PHANTOMS - ); - tagAsSummary("Open OAGIS WSDL", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET}); - startMeasuring(); - for (Iterator it = wsdls.iterator(); it.hasNext();) - openWSDL((IFile)it.next()); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } - else - fail(dir.toString()); - } - - private void copy(File src, IContainer dest) throws CoreException, FileNotFoundException - { - File[] children = src.listFiles(); - for (int i = 0; i < children.length; i++) - { - String name = children[i].getName(); - if (children[i].isDirectory()) - { - IFolder folder = dest.getFolder(new Path(name)); - folder.create(true, true, null); - copy(children[i], folder); - } - else if (name.endsWith(".wsdl") || name.endsWith(".xsd")) - { - IFile file = dest.getFile(new Path(name)); - file.create(new FileInputStream(children[i]), true, null); - } - } - } - - private void joinBackgroundJobs() - { - Display.getDefault().syncExec(new Runnable() - { - public void run() - { - try - { - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); - } - catch (InterruptedException e) - { - } - long start = System.currentTimeMillis(); - Display display = Display.getDefault(); - while (System.currentTimeMillis() - start < 5000) - { - if (!display.readAndDispatch()) - { - display.sleep(); - } - } - } - }); - } - - private void openWSDL(IFile file) throws PartInitException - { - IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - IEditorPart editor = workbenchWindow.getActivePage().openEditor(new FileEditorInput(file), ID_WSDL_EDITOR, true); - workbenchWindow.getActivePage().closeEditor(editor, false); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java deleted file mode 100644 index 5d5c4ceba..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java +++ /dev/null @@ -1,82 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import java.io.IOException; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.intro.IIntroManager; -import org.eclipse.ui.intro.IIntroPart; - -public class OpenStockQuoteWSDLSetup extends TestCase -{ - public static String PROJECT_NAME = "Project"; - - public static Test suite() - { - return new TestSuite(OpenStockQuoteWSDLSetup.class, "OpenStockQuoteWSDLSetup"); - } - - protected void closeIntro() - { - IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager(); - IIntroPart introPart = introManager.getIntro(); - if (introPart != null) - introManager.closeIntro(introPart); - } - - protected IProject createSimpleProject(String name) throws CoreException - { - IProject simpleProject = ResourcesPlugin.getWorkspace().getRoot().getProject(name); - simpleProject.create(null); - simpleProject.open(null); - return simpleProject; - } - - protected void copyFile(IProject project, String source, String dest) throws IOException, CoreException - { - IFile file = project.getFile(dest); - file.create(PerformancePlugin.getDefault().getBundle().getEntry(source).openStream(), true, null); - } - - protected void joinAutoBuild() throws CoreException - { - boolean interrupted = true; - while (interrupted) - { - try - { - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); - interrupted = false; - } - catch (InterruptedException e) - { - interrupted = true; - } - } - } - - public void testSetup() throws Exception - { - closeIntro(); - IProject project = createSimpleProject(PROJECT_NAME); - copyFile(project, "data/StockQuote/StockQuote.wsdl", "StockQuote.wsdl"); - joinAutoBuild(); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java deleted file mode 100644 index 5a7757532..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java +++ /dev/null @@ -1,88 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; - -public class OpenStockQuoteWSDLTestCase extends PerformanceTestCase -{ - private final String EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor"; - - public static Test suite() - { - return new TestSuite(OpenStockQuoteWSDLTestCase.class, "OpenStockQuoteWSDLTestCase"); - } - - protected IProject getProject(String projectName) throws CoreException - { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - assertTrue(project.exists()); - project.open(null); - project.refreshLocal(IProject.DEPTH_INFINITE, null); - joinAutoBuild(); - return project; - } - - protected void joinAutoBuild() throws CoreException - { - boolean interrupted = true; - while (interrupted) - { - try - { - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); - interrupted = false; - } - catch (InterruptedException e) - { - interrupted = true; - } - } - } - - protected IEditorPart openEditor(IEditorInput editorInput, String editorid) throws PartInitException - { - IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - return workbenchWindow.getActivePage().openEditor(editorInput, editorid, true); - } - - protected boolean closeEditor(IEditorPart editor) - { - IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - return workbenchWindow.getActivePage().closeEditor(editor, false); - } - - public void testOpenStockQuoteWSDL() throws Exception - { - IProject project = getProject(OpenStockQuoteWSDLSetup.PROJECT_NAME); - IEditorInput editorInput = new FileEditorInput((IFile)project.findMember("StockQuote.wsdl")); - startMeasuring(); - IEditorPart editorPart = openEditor(editorInput, EDITOR_ID); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - closeEditor(editorPart); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java deleted file mode 100644 index 478f4ab6d..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java +++ /dev/null @@ -1,83 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; -import java.util.*; - -/** - * The main plugin class to be used in the desktop. - */ -public class PerformancePlugin extends Plugin { - //The shared instance. - private static PerformancePlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public PerformancePlugin() { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - resourceBundle = null; - } - - /** - * Returns the shared instance. - */ - public static PerformancePlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = PerformancePlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wsdl.tests.performance.PerformancePluginResources"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java deleted file mode 100644 index 13d566ef9..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.eclipse.wst.wsdl.tests.performance; - -import java.io.File; -import java.io.FileFilter; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.List; -import javax.wsdl.WSDLException; -import junit.framework.Assert; -import org.eclipse.test.performance.Dimension; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLReaderImpl; - -public class ReadOAGISWSDLTestcase extends PerformanceTestCase -{ - private List defs = new ArrayList(); - - public void testReadWSDL() throws MalformedURLException, WSDLException - { - String oagis80Dir = System.getProperty("oagis80Dir"); - Assert.assertNotNull(oagis80Dir); - if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\")) - oagis80Dir = oagis80Dir + "/"; - File dir = new File(oagis80Dir + "OAGIS8.0/ws/wsdl"); - if (dir.exists() && dir.isDirectory()) - { - File[] wsdls = dir.listFiles - ( - new FileFilter() - { - public boolean accept(File pathname) - { - return pathname.getName().endsWith(".wsdl"); - } - } - ); - tagAsSummary("Read OAGIS WSDL", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET}); - startMeasuring(); - for (int i = 0; i < wsdls.length; i++) - readWSDL(wsdls[i].toURL().toString()); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } - else - fail(dir.toString()); - } - - private void readWSDL(String location) throws WSDLException - { - WSDLReaderImpl reader = new WSDLReaderImpl(); - defs.add(reader.readWSDL(location)); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java deleted file mode 100644 index 5f7b53d65..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java +++ /dev/null @@ -1,52 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import java.net.URL; -import java.util.Hashtable; - -import javax.wsdl.Definition; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; - -public class ReadStockQuoteWSDLEMFTestCase extends PerformanceTestCase -{ - public static Test suite() - { - return new TestSuite(ReadStockQuoteWSDLEMFTestCase.class, "ReadStockQuoteWSDLEMFTestCase"); - } - - public void testReadStockQuoteWSDL_EMF() throws Exception - { - startMeasuring(); - URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl"); - - ResourceSet resourceSet = new ResourceSetImpl(); - WSDLResourceImpl resource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl")); - resource.setURI(URI.createURI(wsdl.toString())); - java.util.Map map = new Hashtable(); - map.put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,Boolean.valueOf(true)); - map.put(WSDLResourceImpl.USE_EXTENSION_FACTORIES,Boolean.valueOf(true)); - resource.load(map); - Definition definition = resource.getDefinition(); - - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java deleted file mode 100644 index a78fc6bd4..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java +++ /dev/null @@ -1,41 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import java.net.URL; -import javax.wsdl.Definition; -import javax.wsdl.xml.WSDLReader; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl; -import org.xml.sax.InputSource; - -public class ReadStockQuoteWSDLTestCase extends PerformanceTestCase -{ - public static Test suite() - { - return new TestSuite(ReadStockQuoteWSDLTestCase.class, "ReadStockQuoteWSDLTestCase"); - } - - public void testReadStockQuoteWSDL() throws Exception - { - startMeasuring(); - URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl"); - WSDLFactoryImpl factory = new WSDLFactoryImpl(); - WSDLReader reader = factory.newWSDLReader(); - Definition definition = reader.readWSDL(wsdl.toString(), new InputSource(wsdl.openStream())); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java deleted file mode 100644 index 542e40772..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.eclipse.wst.wsdl.tests.performance; - -import java.io.File; -import java.io.FileFilter; -import java.net.MalformedURLException; -import javax.wsdl.WSDLException; -import junit.framework.Assert; -import org.eclipse.test.performance.Dimension; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator; - -public class ValidateOAGISWSDLTestcase extends PerformanceTestCase -{ - private WSDLValidator validator; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.setUp(); - // Set the WS-I preference to ignore so only WSDL errors will be tested. - WSPlugin wsui = WSPlugin.getInstance(); - PersistentWSIContext wsicontext = wsui.getWSISSBPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - wsicontext = wsui.getWSIAPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - } - - public void testValidateWSDL() throws MalformedURLException, WSDLException - { - String oagis80Dir = System.getProperty("oagis80Dir"); - Assert.assertNotNull(oagis80Dir); - if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\")) - oagis80Dir = oagis80Dir + "/"; - File dir = new File(oagis80Dir + "OAGIS8.0/ws/wsdl"); - if (dir.exists() && dir.isDirectory()) - { - File[] wsdls = dir.listFiles - ( - new FileFilter() - { - public boolean accept(File pathname) - { - return pathname.getName().endsWith(".wsdl"); - } - } - ); - tagAsSummary("Validate OAGIS WSDL", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET}); - validator = WSDLValidator.getInstance(); - startMeasuring(); - for (int i = 0; i < wsdls.length; i++) - validateWSDL(wsdls[i].toURL().toString()); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } - else - fail(dir.toString()); - } - - private void validateWSDL(String location) throws WSDLException - { - IValidationReport valreport = validator.validate(location); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java deleted file mode 100644 index 73353723b..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.eclipse.wst.wsdl.tests.performance; - -import java.io.File; -import java.io.FileFilter; -import java.net.MalformedURLException; -import javax.wsdl.WSDLException; -import junit.framework.Assert; -import org.eclipse.test.performance.Dimension; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator; - -public class ValidateOAGISWSITestcase extends PerformanceTestCase -{ - private WSDLValidator validator; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.setUp(); - // Set the WS-I preference to ignore so only WSDL errors will be tested. - WSPlugin wsui = WSPlugin.getInstance(); - PersistentWSIContext wsicontext = wsui.getWSISSBPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI); - wsicontext = wsui.getWSIAPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI); - } - - public void testValidateWSDL() throws MalformedURLException, WSDLException - { - String oagis80Dir = System.getProperty("oagis80Dir"); - Assert.assertNotNull(oagis80Dir); - if (!oagis80Dir.endsWith("/") && !oagis80Dir.endsWith("\\")) - oagis80Dir = oagis80Dir + "/"; - File dir = new File(oagis80Dir + "OAGIS8.0/ws/wsdl"); - if (dir.exists() && dir.isDirectory()) - { - File[] wsdls = dir.listFiles - ( - new FileFilter() - { - public boolean accept(File pathname) - { - return pathname.getName().endsWith(".wsdl"); - } - } - ); - tagAsSummary("Validate OAGIS WSDL with WS-I", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET}); - validator = WSDLValidator.getInstance(); - startMeasuring(); - for (int i = 0; i < wsdls.length; i++) - validateWSDL(wsdls[i].toURL().toString()); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } - else - fail(dir.toString()); - } - - private void validateWSDL(String location) throws WSDLException - { - IValidationReport valreport = validator.validate(location); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java deleted file mode 100644 index 5cf486f2d..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import java.net.URL; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator; - -public class ValidateStockQuoteWSDLTestCase extends PerformanceTestCase -{ - private WSDLValidator validator; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.setUp(); - // Set the WS-I preference to ignore so only WSDL errors will be tested. - WSPlugin wsui = WSPlugin.getInstance(); - PersistentWSIContext wsicontext = wsui.getWSISSBPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - wsicontext = wsui.getWSIAPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - } - - public static Test suite() - { - return new TestSuite(ValidateStockQuoteWSDLTestCase.class, "ValidateStockQuoteWSDLTestCase"); - } - - public void testValidateStockQuoteWSDL() throws Exception - { - validator = WSDLValidator.getInstance(); - URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl"); - String path = wsdl.toString(); - - startMeasuring(); - IValidationReport valreport = validator.validate(path); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java deleted file mode 100644 index b0ec842a7..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests.performance; - -import java.net.URL; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator; - -public class ValidateStockQuoteWSITestCase extends PerformanceTestCase -{ - private WSDLValidator validator; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.setUp(); - // Set the WS-I preference to ignore so only WSDL errors will be tested. - WSPlugin wsui = WSPlugin.getInstance(); - PersistentWSIContext wsicontext = wsui.getWSISSBPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI); - wsicontext = wsui.getWSIAPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.STOP_NON_WSI); - } - - public static Test suite() - { - return new TestSuite(ValidateStockQuoteWSITestCase.class, "ValidateStockQuoteWSITestCase"); - } - - public void testValidateStockQuoteWSI() throws Exception - { - validator = WSDLValidator.getInstance(); - URL wsdl = PerformancePlugin.getDefault().getBundle().getEntry("data/StockQuote/StockQuote.wsdl"); - String path = wsdl.toString(); - - startMeasuring(); - IValidationReport valreport = validator.validate(path); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java deleted file mode 100644 index f53c91e8a..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java +++ /dev/null @@ -1,127 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ -package org.eclipse.wst.wsdl.tests.performance; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.swt.widgets.Display; -import org.eclipse.test.performance.Dimension; -import org.eclipse.test.performance.PerformanceTestCase; -import org.eclipse.wst.validation.internal.operations.OneValidatorOperation; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; - -/** - * Test for validation of 50 WSDL files in the sample workspace. - * - * @author Kihup Boo, IBM - */ -public class ValidateWSDLProjectTestCase extends PerformanceTestCase { - - public static Test suite() { - return new TestSuite(ValidateWSDLProjectTestCase.class, "Test"); - } - - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception { - super.setUp(); - // Set the WS-I preference to ignore so WS-I validation will not be run. - WSPlugin wsui = WSPlugin.getInstance(); - PersistentWSIContext wsicontext = wsui.getWSISSBPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - } - - public void testWSDLProjectValidation() throws Exception { - String projectDir = System.getProperty("projectDir"); - Assert.assertNotNull(projectDir); - if (!projectDir.endsWith("/") && !projectDir.endsWith("\\")) - projectDir = projectDir + "/"; - File dir = new File(projectDir); - if (dir.exists() && dir.isDirectory()) { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("WSDLProject"); - project.create(null); - project.open(null); - copy(dir, project); - joinBackgroundJobs(); - - IWorkspaceRunnable myRunnable = new OneValidatorOperation( - project, - "org.eclipse.wst.wsdl.validation.internal.ui.eclipse.Validator", - true, - false); - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - - tagAsSummary("Validate WSDL Project", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.WORKING_SET }); - startMeasuring(); - workspace.run(myRunnable, null); - // project.build(IncrementalProjectBuilder.CLEAN_BUILD,null); - stopMeasuring(); - commitMeasurements(); - assertPerformance(); - } else - fail(dir.toString()); - } - - private void copy(File src, IContainer dest) throws CoreException, - FileNotFoundException { - File[] children = src.listFiles(); - for (int i = 0; i < children.length; i++) { - String name = children[i].getName(); - if (children[i].isDirectory()) { - IFolder folder = dest.getFolder(new Path(name)); - folder.create(true, true, null); - copy(children[i], folder); - } else { - IFile file = dest.getFile(new Path(name)); - file.create(new FileInputStream(children[i]), true, null); - } - } - } - - private void joinBackgroundJobs() { - Display.getDefault().syncExec(new Runnable() { - public void run() { - try { - Platform.getJobManager().join( - ResourcesPlugin.FAMILY_AUTO_BUILD, null); - } catch (InterruptedException e) { - } - long start = System.currentTimeMillis(); - Display display = Display.getDefault(); - while (System.currentTimeMillis() - start < 5000) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - } - }); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml b/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml deleted file mode 100644 index 2a492e22e..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/plugin.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin - id="org.eclipse.wst.wsdl.tests.performance" - name="WSDL Performance Plug-in" - version="1.0.0" - provider-name="" - class="org.eclipse.wst.wsdl.tests.performance.PerformancePlugin"> - - <runtime> - <library name="performance.jar"> - <export name="*"/> - </library> - </runtime> - - <requires> - <import plugin="org.junit"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.test.performance"/> - <import plugin="org.eclipse.wst.validation"/> - <import plugin="org.eclipse.wst.common.frameworks"/> - <import plugin="org.eclipse.wst.wsdl"/> - <import plugin="org.eclipse.wst.wsdl.validation"/> - <import plugin="org.wsdl4j"/> - <import plugin="org.eclipse.wst.ws"/> - <import plugin="org.eclipse.wst.command.env"/> - <import plugin="org.eclipse.wst.command.env.core"/> - </requires> - -</plugin> diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/test.xml b/tests/org.eclipse.wst.wsdl.tests.performance/test.xml deleted file mode 100644 index 389ee23d7..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.performance/test.xml +++ /dev/null @@ -1,237 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="performance" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <property name="eclipse-home" value="${basedir}\..\.."/> - - <!-- sets the properties eclipse-home, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.wsdl.tests.performance"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/> - <property name="extraVMargs" value="-Doagis80Dir=${testDir} -DprojectDir=${testDir}/OAGIS8.0 -Xmx256M"/> - - <property name="workspace" value="${eclipse-home}/workspace_wsdl_performance"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.tests.performance*.xml"/> - </delete> - </target> - - <!-- This target defines the performance tests that need to be run. --> - <target name="performance_suite"> - - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - <antcall target="readOAGISWSDLTestcase"/> - - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - <antcall target="ValidateOAGISWSDLTestcase"/> - - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - <antcall target="ValidateOAGISWSITestcase"/> - - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - <antcall target="ValidateWSDLProjectTestCase"/> - - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - <antcall target="openEditorOAGISWSDLTestcase"/> - - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - <antcall target="ReadStockQuoteWSDLTestCase"/> - - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - <antcall target="ReadStockQuoteWSDLEMFTestCase"/> - - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - <antcall target="ValidateStockQuoteWSDLTestCase"/> - - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - <antcall target="ValidateStockQuoteWSITestCase"/> - - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - <antcall target="OpenStockQuoteWSDLSetup"/> - - </target> - - <target name="readOAGISWSDLTestcase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ReadOAGISWSDLTestcase"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <target name="ValidateOAGISWSDLTestcase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateOAGISWSDLTestcase"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <target name="ValidateOAGISWSITestcase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateOAGISWSITestcase"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <target name="ValidateWSDLProjectTestCase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateWSDLProjectTestCase"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <target name="openEditorOAGISWSDLTestcase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.OpenEditorOAGISWSDLTestcase"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <target name="ReadStockQuoteWSDLTestCase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ReadStockQuoteWSDLTestCase"/> - </ant> - </target> - - <target name="ReadStockQuoteWSDLEMFTestCase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ReadStockQuoteWSDLEMFTestCase"/> - </ant> - </target> - - <target name="ValidateStockQuoteWSDLTestCase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateStockQuoteWSDLTestCase"/> - </ant> - </target> - - <target name="ValidateStockQuoteWSITestCase"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.ValidateStockQuoteWSITestCase"/> - </ant> - </target> - - <target name="OpenStockQuoteWSDLSetup"> - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.OpenStockQuoteWSDLSetup"/> - </ant> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.performance.OpenStockQuoteWSDLTestCase"/> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <delete dir="${workspace}" quiet="true"/> - </target> - - <!-- This target runs the performance test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="performance" depends="init,performance_suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.wst.wsdl.tests.performance*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> - -</project> diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/.classpath b/tests/org.eclipse.wst.wsdl.tests.ui/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore b/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore deleted file mode 100644 index 5eaddfedf..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -wsdl.tests.ui.jar diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/.project b/tests/org.eclipse.wst.wsdl.tests.ui/.project deleted file mode 100644 index b4c5d49c2..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/.project +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.wsdl.tests.ui</name> - <comment></comment> - <projects> - <project>com.ibm.etools.wsdl</project> - <project>org.eclipse.xsd</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/about.html b/tests/org.eclipse.wst.wsdl.tests.ui/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/build.properties b/tests/org.eclipse.wst.wsdl.tests.ui/build.properties deleted file mode 100644 index 64a567bad..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -source.wsdl.tests.ui.jar = src/ -bin.includes = plugin.xml,\ - *.jar,\ - wsdl.tests.ui.jar,\ - TemperatureService.wsdl,\ - jars/,\ - about.html -src.includes = TemperatureService.wsdl,\ - jars/ diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml b/tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml deleted file mode 100644 index 24ad0a8de..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/plugin.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<plugin - id="org.eclipse.wst.wsdl.tests.ui" - name="WSDL Model UI Samples" - version="1.0.0"> - - <runtime> - <library name="wsdl.tests.ui.jar"/> - </runtime> - - <requires> - <import plugin="org.eclipse.core.runtime.compatibility"/> - <import plugin="org.eclipse.wst.wsdl"/> - <import plugin="org.eclipse.wst.wsdl.tests"/> - <import plugin="org.eclipse.xsd"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.ui"/> - <import plugin="org.junit"/> - </requires> - - <extension point="org.eclipse.ui.popupMenus"> - <objectContribution - objectClass="org.eclipse.core.resources.IFile" - nameFilter="*.wsdl" - id="org.eclipse.wst.wsdl.tests.ui.object_contribution"> - <!-- - <action - label="Generate WSDL Sample" - class="org.eclipse.wst.wsdl.tests.ui.GenerateWSDLActionDelegate" - enablesFor="1" - id="org.eclipse.wst.wsdl.tests.ui.generate_wsdl_action"> - </action> - --> - <action - label="Convert to WSDL 2.0 Document" - class="org.eclipse.wst.wsdl.tests.ui.ConvertWSDL20ActionDelegate" - enablesFor="1" - id="org.eclipse.wst.wsdl.tests.ui.convert_wsdl_action"> - </action> - - </objectContribution> - </extension> - -</plugin> diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java b/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java deleted file mode 100644 index ba87f03ae..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/ConvertWSDL20ActionDelegate.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.ui; - -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IActionDelegate; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.tests.util.DefinitionLoader; -import org.eclipse.wst.wsdl.tests.util.WSDLConverter; - - - -public class ConvertWSDL20ActionDelegate implements IActionDelegate -{ - private ISelection selection = null; - - public void run(IAction action) - { - IFile ifile = null; - if (!selection.isEmpty() && selection instanceof IStructuredSelection) - { - IStructuredSelection structuredSelection = (IStructuredSelection) selection; - Object element = structuredSelection.getFirstElement(); - - if (element instanceof IFile) - { - ifile = (IFile) element; - IPath path = ifile.getLocation(); - IPath path2 = path.removeLastSegments(1); - String output = path2.toString() + "/" + getNewName(ifile); - - try - { - Definition def = DefinitionLoader.load("file:/" + path.toString()); - WSDLConverter converter = new WSDLConverter(def); - converter.generate20(output); - IContainer folder = ifile.getParent(); - folder.refreshLocal(IResource.DEPTH_ONE,null); - } - catch (Throwable e) - { - e.printStackTrace(); - } - } - else - return; - } - - } - - private String getNewName(IFile ifile) - { - // Assert currentName has a file extension, e.g. foo.wsdl. - // This will return fooV20.wsdl. - String currentName = ifile.getName(); - String name = currentName.substring(0,currentName.indexOf(".")); - String extension = currentName.substring(currentName.indexOf(".")); - String newName = name + "V20" + extension; - return newName; - } - - public void selectionChanged(IAction action, ISelection selection) - { - this.selection = selection; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java b/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java deleted file mode 100644 index 19ae8c3ed..000000000 --- a/tests/org.eclipse.wst.wsdl.tests.ui/src/org/eclipse/wst/wsdl/tests/ui/GenerateWSDLActionDelegate.java +++ /dev/null @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.ui; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IActionDelegate; -import org.eclipse.wst.wsdl.tests.WSDLGenerationTest; - -public class GenerateWSDLActionDelegate implements IActionDelegate -{ - private ISelection selection = null; - - public void run(IAction action) - { - IFile ifile = null; - if (!selection.isEmpty() && selection instanceof IStructuredSelection) - { - IStructuredSelection structuredSelection = (IStructuredSelection) selection; - Object element = structuredSelection.getFirstElement(); - - if (element instanceof IFile) - { - ifile = (IFile) element; - IPath path = ifile.getLocation(); - path = path.removeLastSegments(1); - String output = path.toString() + "/MySample.wsdl"; - - try - { - (new WSDLGenerationTest()).generateTemperatureService(output); - } - catch (Exception e) - { - e.printStackTrace(); - } - - } - else - return; - } - - } - - public void selectionChanged(IAction action, ISelection selection) - { - this.selection = selection; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/.classpath b/tests/org.eclipse.wst.wsdl.tests/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.wsdl.tests/.cvsignore b/tests/org.eclipse.wst.wsdl.tests/.cvsignore deleted file mode 100644 index 8b5249c38..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -wsdl.tests.jar diff --git a/tests/org.eclipse.wst.wsdl.tests/.project b/tests/org.eclipse.wst.wsdl.tests/.project deleted file mode 100644 index 07bfa846f..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/.project +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.wsdl.tests</name> - <comment></comment> - <projects> - <project>com.ibm.etools.wsdl</project> - <project>com.ibm.wsdl</project> - <project>org.apache.xerces</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime.compatibility</project> - <project>org.eclipse.emf.ecore</project> - <project>org.eclipse.ui</project> - <project>org.eclipse.xsd</project> - <project>org.junit</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.wsdl.tests/about.html b/tests/org.eclipse.wst.wsdl.tests/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests/build.properties b/tests/org.eclipse.wst.wsdl.tests/build.properties deleted file mode 100644 index 6a439a107..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -bin.includes = plugin.xml,\ - test.xml,\ - .options,\ - testResources/,\ - runtests.bat,\ - JUNIT.XSL,\ - runtime/,\ - wsdl.tests.jar,\ - samples/,\ - about.html -source.wsdl.tests.jar = src/ -src.includes = build.xml,\ - .options,\ - JUNIT.XSL,\ - runtests.bat,\ - testResources/,\ - runtime/,\ - PTATimeDistribution.wsdl,\ - TDDataSet.xsd diff --git a/tests/org.eclipse.wst.wsdl.tests/plugin.xml b/tests/org.eclipse.wst.wsdl.tests/plugin.xml deleted file mode 100644 index da2a26f35..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/plugin.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin - id="org.eclipse.wst.wsdl.tests" - name="WSDL JUnit Test" - version="1.0.0" - class="org.eclipse.wst.wsdl.tests.WSDLTestsPlugin"> - - <runtime> - <library name="wsdl.tests.jar"> - <export name="*"/> - </library> - </runtime> - - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.wst.wsdl"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.xsd"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.junit"/> - <import plugin="org.wsdl4j"/> - <import plugin="org.eclipse.wst.common.uriresolver"/> - </requires> - -</plugin>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl deleted file mode 100644 index 0cb3a53fc..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/LoadAndPrintTest.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/LoadAndPrintTest/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="LoadAndPrintTest" targetNamespace="http://tempuri.org/LoadAndPrintTest/"> - <wsdl:types> - <xsd:schema targetNamespace="http://tempuri.org/LoadAndPrintTest/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="LoadAndPrintTest"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="LoadAndPrintTestSOAP" type="tns:LoadAndPrintTest"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://tempuri.org/LoadAndPrintTest/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="LoadAndPrintTest"> - <wsdl:port binding="tns:LoadAndPrintTestSOAP" name="LoadAndPrintTestSOAP"> - <soap:address location="http://tempuri.org"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java deleted file mode 100644 index eadd168d8..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author Kihup Boo - */ -public class AllTestCases extends TestCase -{ - - public AllTestCases() - { - } - - public static void main(String[] args) - { - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest(InlineSchemaTest.suite()); - suite.addTest(LoadAndSerializationTest.suite()); - suite.addTest(SemanticTest.suite()); - suite.addTest(WSDLGenerationTest.suite()); - suite.addTest(WSDL4JAPITest.suite()); - suite.addTest(WSDLEMFAPITest.suite()); - suite.addTest(UtilTest.suite()); - - return suite; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java deleted file mode 100644 index 587facfac..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/InlineSchemaTest.java +++ /dev/null @@ -1,226 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.wsdl.tests; - -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URL; -import java.util.Iterator; - -import javax.wsdl.xml.WSDLReader; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.runtime.IPluginDescriptor; -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Types; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.tests.util.DefinitionLoader; -import org.eclipse.xsd.XSDElementDeclaration; -import org.eclipse.xsd.XSDModelGroup; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.XSDParticle; -import org.eclipse.xsd.XSDParticleContent; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.XSDSimpleTypeDefinition; -import org.eclipse.xsd.XSDTypeDefinition; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.xml.sax.InputSource; - -/** - * @author Kihup Boo - */ -public class InlineSchemaTest extends TestCase -{ - private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL(); - - public InlineSchemaTest(String name) - { - super(name); - } - - public static void main(String[] args) - { - //junit.textui.TestRunner.run(InlineSchemaTest.class); - junit.textui.TestRunner.run(suite()); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new InlineSchemaTest("InlineSchema") - { - protected void runTest() - { - testInlineSchema(); - } - } - ); - - suite.addTest - (new InlineSchemaTest("InlineSchemaWithWSDL4J") - { - protected void runTest() - { - testInlineSchemaWithWSDL4J(); - } - } - ); - - return suite; - } - - protected void setUp() throws Exception - { - super.setUp(); - - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - - public void testInlineSchema() - { - try - { - Definition definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH +"samples/LoadAndPrintTest.wsdl"); - traverseDefinition(definition); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public void testInlineSchemaWithWSDL4J() - { - try - { - Definition definition = loadDefinitionForWSDL4J("./samples/LoadAndPrintTest.wsdl"); - traverseDefinition(definition); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public void traverseDefinition(Definition definition) throws Exception - { - Assert.assertNotNull(definition); - - Iterator iter = definition.getEImports().iterator(); - while (iter.hasNext()) - { - Import myImport = (Import)iter.next(); - //traverseImport(myImport); - } - - // Get Inline Schema - Types types = (org.eclipse.wst.wsdl.Types)definition.getTypes(); - Assert.assertNotNull("<types> is null",types); - if (types != null) - { - Iterator iterator = types.getSchemas().iterator(); - Assert.assertTrue("<types> does not have inline <schema>s",iterator.hasNext()); - while (iterator.hasNext()) - { - XSDSchema schema = (XSDSchema)iterator.next(); - traverseSchema(schema); - } - } - } - - private void traverseImport(Import myImport) throws Exception - { - Definition def = myImport.getEDefinition(); - traverseDefinition(def); - } - - private void traverseSchema(XSDSchema schema) - { - Iterator iterator = schema.getElementDeclarations().iterator(); - XSDElementDeclaration elementDecl = null; - Assert.assertTrue("No <element>s are found",iterator.hasNext()); - while (iterator.hasNext()) - { - elementDecl = (XSDElementDeclaration)iterator.next(); - - if (elementDecl.getName().equals("NewOperationResponse")) - traverseElementDecl(elementDecl); - else if (elementDecl.getName().equals("NewOperationRequest")) - traverseElementDecl(elementDecl); - } - } - - private void traverseElementDecl(XSDElementDeclaration elementDecl) - { - XSDTypeDefinition type = elementDecl.getTypeDefinition(); - Assert.assertTrue("<element> does not have <simpleType>",type instanceof XSDSimpleTypeDefinition); - if (type.getComplexType() == null) // simple type - return; // TBD - Currently this always returns at this point. - XSDParticleContent content = type.getComplexType().getContent(); - traverseModelGroup((XSDModelGroup)content); - } - - private void traverseModelGroup(XSDModelGroup modelGroup) - { - Iterator iterator = modelGroup.getContents().iterator(); - XSDParticleContent particleContent = null; - while (iterator.hasNext()) - { - particleContent = ((XSDParticle)iterator.next()).getContent(); - if (particleContent instanceof XSDElementDeclaration) - { - if (((XSDElementDeclaration)particleContent).isElementDeclarationReference()) - traverseElementDecl(((XSDElementDeclaration)particleContent).getResolvedElementDeclaration()); - else - traverseElementDecl((XSDElementDeclaration)particleContent); - } - } - } - - private Definition loadDefinition(String wsdlFile) throws IOException - { - return DefinitionLoader.load(wsdlFile); - } - - private Definition loadDefinitionForWSDL4J(String wsdlFile) throws Exception - { - WSDLReader reader = (new WSDLFactoryImpl()).newWSDLReader(); - IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests"); - URL url = pd.getInstallURL(); - url = new URL(url,wsdlFile); - String s = Platform.resolve(url).getFile(); - Definition definition = (org.eclipse.wst.wsdl.Definition)reader.readWSDL(s,new InputSource(new FileInputStream(s))); - return definition; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java deleted file mode 100644 index eccc6ae53..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/LoadAndSerializationTest.java +++ /dev/null @@ -1,193 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import java.io.File; -import java.io.FileFilter; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; - -import org.eclipse.wst.wsdl.tests.util.DefinitionLoader; -import org.eclipse.wst.wsdl.tests.util.XMLDiff; - -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Element; - -/** - * @author Kihup Boo - */ -public class LoadAndSerializationTest extends TestCase -{ - { - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL(); - static private File[] wsdls; - static private Definition definition = null; - - /** - * Executes a stand-alone test. - * @param objects an array of Strings from the command line. - * @see #run - */ - public static void main(String args[]) - { - junit.textui.TestRunner.run(suite()); - } - - public LoadAndSerializationTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - suite.addTest - (new LoadAndSerializationTest("LoadAndStore") - { - protected void runTest() - { - testLoadAndStore(); - } - } - ); - /* suite.addTest // wtp bug 79326 - (new LoadAndSerializationTest("Compare") - { - protected void runTest() - { - testCompare(); - } - } - ); */ - return suite; - } - - /** - * Load from the WSDL definitions file and store back to a different file. - */ - public void testLoadAndStore() - { - File dir = new File(PLUGIN_ABSOLUTE_PATH + "samples"); - if (dir.exists() && dir.isDirectory()) - { - wsdls = dir.listFiles - ( - new FileFilter() - { - public boolean accept(File pathname) - { - return pathname.getName().endsWith(".wsdl"); - } - } - ); - - try - { - for (int i = 0; i < wsdls.length; i++) - { - System.out.println(wsdls[i].toURL().toString()); - load(wsdls[i].toString()); - print(wsdls[i].toString() + ".out"); - } - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - else - fail(dir.toString()); - - } - - /* - * Load from the WSDL definitions file. - */ - private void load(String filename) - { - try - { - definition = DefinitionLoader.load(filename); - Assert.assertNotNull(definition); - Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl); - - WSDLResourceImpl wsdlResource = (WSDLResourceImpl)definition.eResource(); - Assert.assertNotNull(wsdlResource); - - Element element = definition.getElement(); - Assert.assertNotNull(definition.getElement()); - - WSDLResourceImpl.serialize(System.out, element); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - /* - * Store the WSDL definitions to a file. - */ - private void print(String filename) - { - try - { - // This removes the associated DOM element, creates a new associated DOM element, and then prints it. - // This is a good test for how well serialization works for a model created "bottom up". - // - definition.setDocument(null); - definition.setElement(null); - ((DefinitionImpl)definition).updateElement(); - - DefinitionLoader.store(definition,filename); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - /** - * Compare the output WSDL file to the original. - */ - public void testCompare() - { - XMLDiff xmldiff = new XMLDiff(); - try - { - for (int i = 0; i < wsdls.length; i++) - Assert.assertTrue(xmldiff.diff(wsdls[i].toString(),wsdls[i].toString() + ".out")); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java deleted file mode 100644 index 4ccaa4dab..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; - -public class MyResolver implements EntityResolver -{ - public InputSource resolveEntity(String publicId, String systemId) - { - if (systemId.equals("http://www.myhost.com/today")) - { - // return a special input source - //MyReader reader = new MyReader(); - //return new InputSource(reader); - return new InputSource(systemId); // TBD - } - else - { - // use the default behaviour - return null; - } - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java deleted file mode 100644 index 474d9854c..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import java.io.FileInputStream; -import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.w3c.dom.Document; -import org.xml.sax.EntityResolver; - -public class ParserTest extends TestCase -{ - - public ParserTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new ParserTest("Parser") - { - protected void runTest() - { - testParser(); - } - } - ); - - return suite; - } - - public void testParser() - { - EntityResolver myResolver = new MyResolver(); - try - { - InputStream is = new FileInputStream("./samples/LoadAndPrintTest.wsdl"); - DocumentBuilder myBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - myBuilder.setEntityResolver(myResolver); - Document doc = myBuilder.parse(is); - Assert.assertNotNull("Document is null",doc); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public static void main(String[] args) - { - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java deleted file mode 100644 index 16c2962af..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java +++ /dev/null @@ -1,230 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.WSDLFactory; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLConstants; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; - -public class RefactoringTest extends TestCase -{ - public RefactoringTest() - { - //init(); - } - - public RefactoringTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new RefactoringTest("Refactoring") - { - protected void runTest() - { - testRefactoring(); - } - } - ); - - return suite; - } - - public void testRefactoring() - { - try - { - // Before running this test, modify the location of the generated WSDL file - generateWSDL("RefactoringTest.wsdl"); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - protected void setUp() throws Exception - { - super.setUp(); - - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - - // defect 6594 - public void renameOperation(Operation op) - { - Input input = op.getEInput(); - Assert.assertNotNull(input); - Message message = input.getEMessage(); - Assert.assertNotNull(message); - - op.setName("Renamed" + op.getName()); - QName newQName = new QName(message.getQName().getNamespaceURI(),"Renamed" + message.getQName().getLocalPart()); - message.setQName(newQName); - } - - public void generateWSDL(String outputFile) throws Exception - { - ResourceSet resourceSet = new ResourceSetImpl(); - Resource resource = resourceSet.createResource(URI.createFileURI(outputFile)); - resourceSet.getResources().add(resource); - - // Create a Definition - Temperature - Definition definition = WSDLFactory.eINSTANCE.createDefinition(); - definition.setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI,"Temparature")); - resource.getContents().add(definition); - - // Target namespace - http://www.temperature.com - definition.setTargetNamespace("http://www.temperature.com"); - definition.addNamespace("tns", "http://www.temperature.com"); - - // Other namespaces - wsdl, soap, xsd - definition.addNamespace("wsdl", WSDLConstants.WSDL_NAMESPACE_URI); - definition.addNamespace("xsd", WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001); - definition.addNamespace("soap", SOAPConstants.SOAP_NAMESPACE_URI); - - // - // Let's start building two messages - // - - // Create a Part - ZipCode - Part part = WSDLFactory.eINSTANCE.createPart(); - part.setName("ZipCode"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string")); - - // Create a Message - GetTemperatureInput - Message inputMessage = WSDLFactory.eINSTANCE.createMessage(); - inputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInput")); - inputMessage.addPart(part); - definition.addMessage(inputMessage); - - // Create a Part - Temperature - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Temperature"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float")); - - // Create a Message - GetTemperatureOutput - Message outputMessage = WSDLFactory.eINSTANCE.createMessage(); - outputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureOutput")); - outputMessage.addPart(part); - definition.addMessage(outputMessage); - - // - // Next, build a PortType - // - - // Create an Input - GetTemperatureInput - Input input = WSDLFactory.eINSTANCE.createInput(); - input.setMessage(inputMessage); - - // Create an Output - GetTemperatureOutput - Output output = WSDLFactory.eINSTANCE.createOutput(); - output.setMessage(outputMessage); - - // Create an Operation - GetTemperatureForZipCode - Operation operation = WSDLFactory.eINSTANCE.createOperation(); - operation.setName("GetTemperatureForZipCode"); - operation.setInput(input); - operation.setOutput(output); - - // Create a PortType - PortType portType = WSDLFactory.eINSTANCE.createPortType(); - portType.setQName(new QName(definition.getTargetNamespace(),"GetTemparatureInfoSOAP")); - portType.addOperation(operation); - definition.addPortType(portType); - - // - // Create the second set op Operations - // - - // Create a Part - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Part2"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string")); - - // Create a Message - Message inputMessage2 = WSDLFactory.eINSTANCE.createMessage(); - inputMessage2.setQName(new QName(definition.getTargetNamespace(), "InputMessage2")); - inputMessage2.addPart(part); - definition.addMessage(inputMessage2); - - // Create a Part - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Part3"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float")); - - // Create a Message - GetTemperatureOutput - Message outputMessage2 = WSDLFactory.eINSTANCE.createMessage(); - outputMessage2.setQName(new QName(definition.getTargetNamespace(), "OutputMessage2")); - outputMessage2.addPart(part); - definition.addMessage(outputMessage2); - - // Create an Input - Input input2 = WSDLFactory.eINSTANCE.createInput(); - input2.setMessage(inputMessage2); - - // Create an Output - GetTemperatureOutput - Output output2 = WSDLFactory.eINSTANCE.createOutput(); - output2.setMessage(outputMessage2); - - // Create an Operation - GetTemperatureForZipCode - Operation operation2 = WSDLFactory.eINSTANCE.createOperation(); - operation2.setName("Operation2"); - operation2.setInput(input2); - operation2.setOutput(output2); - - portType.addOperation(operation2); - - renameOperation(operation); - renameOperation(operation2); - - resource.save(null); - - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java deleted file mode 100644 index 4119daf19..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/SemanticTest.java +++ /dev/null @@ -1,513 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import java.util.Iterator; - -import javax.wsdl.OperationType; -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingFault; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.ExtensibleElement; -import org.eclipse.wst.wsdl.Fault; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.MessageReference; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.Types; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.binding.soap.SOAPAddress; -import org.eclipse.wst.wsdl.binding.soap.SOAPBinding; -import org.eclipse.wst.wsdl.binding.soap.SOAPBody; -import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.tests.util.DefinitionLoader; -import org.eclipse.wst.wsdl.tests.util.DefinitionVisitor; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Element; - -/** - * @author Kihup Boo - */ -public class SemanticTest extends DefinitionVisitor -{ - private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL(); - //private String wsdlNamespacePrefix; - //private String xsdNamespacePrefix; - - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - // Added for JUnit - public SemanticTest(String name) - { - super(name); - } - - /** - * @param definition - */ - public SemanticTest(Definition definition) - { - super(definition); - } -/* - private void serialize(String filename) throws Exception - { - Source domSource = new DOMSource(doc); - Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT,"yes"); - transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4"); - transformer.transform(domSource,new StreamResult(new FileOutputStream(filename))); - } - - private void createDocument() throws ParserConfigurationException - { - doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - } - - private Element createWSDLElement(String name) - { - Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name); - if (wsdlNamespacePrefix != null) - element.setPrefix(wsdlNamespacePrefix); - - return element; - } - */ - private void visitDocumentation(Element docElement) - { - if (docElement == null) - return; - println("documentation: " + docElement); // TBD - serialize docElement - } - - private void println(String s) - { - System.out.println(s); - } - - protected void visitDefinition(Definition def) - { - println("Visiting definitions..."); - visitDocumentation(def.getDocumentationElement()); - - QName qname = def.getQName(); - if (qname != null) - println("name: " + qname.getLocalPart()); - - String targetNamespace = def.getTargetNamespace(); - if (targetNamespace != null) - println("targetNamespace: " + targetNamespace); - - Iterator iterator = def.getNamespaces().keySet().iterator(); - String prefix = null; - String namespace = null; - - while (iterator.hasNext()) - { - prefix = (String)iterator.next(); - namespace = def.getNamespace(prefix); - println("namespace prefix: " + prefix + ", namespace URI: " + namespace); - } - super.visitDefinition(def); - println("Leaving definitions..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitImport(org.eclipse.wst.wsdl.Import) - */ - protected void visitImport(Import wsdlImport) - { - println("Visiting import..."); - // Determine if we <import> a schema. - if (importingSchema(wsdlImport)) - { - println("<import>ing XML Schema"); - - // <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/> - println("namespace: " + wsdlImport.getNamespaceURI()); - println("schemaLocation: " + wsdlImport.getLocationURI()); - visitDocumentation(wsdlImport.getDocumentationElement()); - } - else - { - println("<import>ing WSDL"); - visitDocumentation(wsdlImport.getDocumentationElement()); - } - println("Leaving import..."); - } - - private boolean importingSchema(Import myImport) - { - if (myImport.getDefinition() != null) // it is WSDL import - return false; - else - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitTypes(org.eclipse.wst.wsdl.Types) - */ - protected void visitTypes(Types types) - { - println("Visiting types..."); - - Iterator iterator = types.getSchemas().iterator(); - XSDSchema schema = null; - while (iterator.hasNext()) - { - schema = (XSDSchema)iterator.next(); - println("in-line schema: " + schema); - } - println("Leaving types..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPart(org.eclipse.wst.wsdl.Part) - */ - protected void visitPart(Part part) - { - println("Visiting part..."); - } - - protected void visitPortType(PortType portType) - { - println("Visiting portType..."); - visitDocumentation(portType.getDocumentationElement()); - - QName qname = portType.getQName(); - if (qname != null) - println("name: " + qname.getLocalPart()); - - super.visitPortType(portType); - println("Leaving portType..."); - } - - protected void visitOperation(Operation operation) - { - println("Visiting operation..."); - visitDocumentation(operation.getDocumentationElement()); - - String name = operation.getName(); - if (name != null) - println("name: " + name); - - OperationType opType = operation.getStyle(); - Assert.assertNotNull("Failed determining Operation Type",opType); - - if (OperationType.REQUEST_RESPONSE == opType) - println("op type: " + "in-out"); - else if (OperationType.SOLICIT_RESPONSE == opType) - println("op type" + "out-in"); - else if (OperationType.NOTIFICATION == opType) - println("op type" + "out-only"); - else if (OperationType.ONE_WAY == opType) - println("op type" + "in-only"); - - super.visitOperation(operation); - println("Leaving operation..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitInput(org.eclipse.wst.wsdl.Input) - */ - protected void visitInput(Input input) - { - println("Visiting input..."); - visitDocumentation(input.getDocumentationElement()); - - String name = input.getName(); - if (name != null) - println("name: " + name); - - Message message = input.getEMessage(); - Assert.assertNotNull("Failed to resolve the message",message); - - println("Leaving input..."); - } - - private Element getPartElement(MessageReference messageRef) - { - Iterator iterator = messageRef.getEMessage().getEParts().iterator(); - // TBD - for now, take the first part. - Part part = (Part)iterator.next(); - Element partElement = part.getElement(); - return partElement; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitOutput(org.eclipse.wst.wsdl.Output) - */ - protected void visitOutput(Output output) - { - println("Visiting output..."); - visitDocumentation(output.getDocumentationElement()); - - String name = output.getName(); - if (name != null) - println("name: " + name); - - Message message = output.getEMessage(); - Assert.assertNotNull("Failed to resolve the message",message); - - println("Leaving output..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitFault(org.eclipse.wst.wsdl.Fault) - */ - protected void visitFault(Fault fault) - { - println("Visiting fault..."); - println("Leaving fault..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitBinding(org.eclipse.wst.wsdl.Binding) - */ - protected void visitBinding(Binding binding) - { - println("Visiting binding..."); - visitDocumentation(binding.getDocumentationElement()); - - QName qname = binding.getQName(); - if (qname != null) - println("name: " + qname.getLocalPart()); - - PortType portType = binding.getEPortType(); - Assert.assertNotNull("Failed to resolve the portType",portType); - - super.visitBinding(binding); - Assert.assertTrue("<soapBody> is missing",soapBodyVisited); - Assert.assertTrue("<soapBinding> is missing",soapBindingVisited); - Assert.assertTrue("<soapOperation> is missing",soapOperationVisited); - println("Leaving binding..."); - } - - protected void visitBindingOperation(BindingOperation bindingOperation) - { - println("Visiting binding operation..."); - visitDocumentation(bindingOperation.getDocumentationElement()); - - Operation operation = bindingOperation.getEOperation(); - Assert.assertNotNull("Failed to resolve the operation",operation); - - if (operation != null) - { - String operationName = operation.getName(); - println("name: " + operationName); - } - - super.visitBindingOperation(bindingOperation); - println("Leaving binding operation..."); - } - - protected void visitBindingInput(BindingInput input) - { - println("Visiting binding input..."); - visitDocumentation(input.getDocumentationElement()); - - String inputName = input.getName(); - if (inputName != null) - println("name: " + inputName); - - super.visitBindingInput(input); - println("Leaving binding input..."); - } - - protected void visitBindingOutput(BindingOutput output) - { - println("Visiting binding output..."); - visitDocumentation(output.getDocumentationElement()); - - String outputName = output.getName(); - if (outputName != null) - println("name: " + outputName); - - super.visitBindingOutput(output); - println("Leaving binding output..."); - } - - protected void visitBindingFault(BindingFault fault) - { - println("Visiting binding fault..."); - visitDocumentation(fault.getDocumentationElement()); - - Element faultElement = fault.getElement(); - String faultName = fault.getName(); - if (faultName != null) - faultElement.setAttribute("name",faultName); - - super.visitBindingFault(fault); - println("Leaving binding fault..."); - } - - protected void visitService(Service service) - { - println("Visiting service..."); - visitDocumentation(service.getDocumentationElement()); - - QName qname = service.getQName(); - Assert.assertNotNull("Validation Error: service is missing the name attribute",qname); - if (qname != null) - println("name: " + qname.getLocalPart()); - - super.visitService(service); - println("Leaving service..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPort(org.eclipse.wst.wsdl.Port) - */ - protected void visitPort(Port port) - { - println("Visiting port..."); - visitDocumentation(port.getDocumentationElement()); - - String name = port.getName(); - Assert.assertNotNull("Validation Error: port is missing the name attribute",port); - if (name != null) - println("name: " + port.getName()); - - Binding binding = port.getEBinding(); - Assert.assertNotNull("Failed to resolve the binding",binding); - - super.visitPort(port); - Assert.assertTrue("<soapAddress> is missing",soapAddressVisited); - println("Leaving port..."); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitExtensibilityElement(org.eclipse.wst.wsdl.ExtensibleElement, org.eclipse.wst.wsdl.ExtensibilityElement) - */ - protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement) - { - println("Visiting extensibility element..."); - if (extensibilityElement instanceof SOAPBody) - visitSOAPBody((SOAPBody)extensibilityElement); - else if (extensibilityElement instanceof SOAPBinding) - visitSOAPBinding((SOAPBinding)extensibilityElement); - else if (extensibilityElement instanceof SOAPAddress) - visitSOAPAddress((SOAPAddress)extensibilityElement); - else if (extensibilityElement instanceof SOAPOperation) - visitSOAPOperation((SOAPOperation)extensibilityElement); - println("Leaving extensibility element..."); - } - - //Needs to improve this part - private boolean soapOperationVisited = false; - private void visitSOAPOperation(SOAPOperation soapOperation) - { - soapOperationVisited = true; - println("Visiting SOAPOperation..."); - println("soapAction: " + soapOperation.getSoapActionURI()); - println("Leaving SOAPOperation..."); - } - - //Needs to improve this part - private boolean soapBodyVisited = false; - private void visitSOAPBody(SOAPBody soapBody) - { - soapBodyVisited = true; - println("Visiting SOAPBody..."); - println("use: " + soapBody.getUse()); - println("Leaving SOAPBody..."); - } - - //Needs to improve this part - private boolean soapBindingVisited = false; - private void visitSOAPBinding(SOAPBinding soapBinding) - { - soapBindingVisited = true; - println("Visiting SOAPBinding..."); - println("style: " + soapBinding.getStyle()); - println("transport: " + soapBinding.getTransportURI()); - println("Leaving SOAPBinding..."); - } - - // Needs to improve this part - private boolean soapAddressVisited = false; - private void visitSOAPAddress(SOAPAddress soapAddress) - { - soapAddressVisited = true; - println("Visiting SOAPAddress..."); - println("location: " + soapAddress.getLocationURI()); - println("Leaving SOAPAddress..."); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new SemanticTest("ModelSemanticTest") - { - protected void runTest() - { - testModelSemantic(); - } - } - ); - return suite; - } - - public void testModelSemantic() - { - try - { - Definition def = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/LoadAndPrintTest.wsdl",true); - SemanticTest test = new SemanticTest(def); - test.visit(); - } - catch (Exception e) - { - Assert.fail(e.toString()); - } - } - - public static void main(String[] args) - { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java deleted file mode 100644 index 922a78aa4..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/UtilTest.java +++ /dev/null @@ -1,280 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.WSDLPlugin; -import org.eclipse.wst.wsdl.binding.soap.SOAPHeader; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; -import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.tests.util.DefinitionLoader; -import org.eclipse.wst.wsdl.util.ExtensibilityElementFactory; -import org.eclipse.wst.wsdl.util.ExtensibilityElementFactoryRegistry; -import org.eclipse.wst.wsdl.util.WSDLConstants; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -public class UtilTest extends TestCase { - private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL(); - - public UtilTest(String name) - { - super(name); - } - - public static void main(String args[]) - { - junit.textui.TestRunner.run(suite()); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new UtilTest("WSDLConstants") - { - protected void runTest() - { - testConstants(); - } - } - ); - - suite.addTest - (new UtilTest("WSDLResourceFactoryImpl") - { - protected void runTest() - { - testWSDLResourceFactoryImpl(); - } - } - ); - - suite.addTest - (new UtilTest("WSDLResourceImpl") - { - protected void runTest() - { - testWSDLResourceImpl(); - } - } - ); - suite.addTest - (new UtilTest("ExtensibilityElementFactory") - { - protected void runTest() - { - testExtensibilityElementFactory(); - } - } - ); - suite.addTest - (new UtilTest("ExtensibilityElementFactoryRegistry") - { - protected void runTest() - { - testExtensibilityElementFactoryRegistry(); - } - } - ); - - - - return suite; - } - - protected void setUp() throws Exception - { - super.setUp(); - - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - - static private Definition definition = null; - - public void testConstants() - { - try - { - WSDLConstants wsdlConstants = new WSDLConstants(); - int type = WSDLConstants.nodeType(WSDLConstants.PORT_ELEMENT_TAG); - Assert.assertTrue("Node type is not that of port", type == 10); - - definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/LoadAndPrintTest.wsdl"); - Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl); - - int definitionNodeType = WSDLConstants.nodeType(definition.getElement()); - Assert.assertTrue("Node type is not that of definition", definitionNodeType == 1); - - boolean isWSDLNamespace = WSDLConstants.isWSDLNamespace(definition.getTargetNamespace()); - Assert.assertFalse("This should not be the WSDL Namespace", isWSDLNamespace); - - boolean isMatching = WSDLConstants.isMatchingNamespace("http://www.example.org", "http://www.example.org"); - Assert.assertTrue("isMatchingNamespace is incorrect", isMatching); - - String attr = WSDLConstants.getAttribute(definition.getElement(), "name"); - Assert.assertTrue("getAttribute is incorrect", attr.equals("LoadAndPrintTest")); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public void testWSDLResourceFactoryImpl() - { - try - { - WSDLResourceFactoryImpl factoryImpl = new WSDLResourceFactoryImpl(); - Resource resource = factoryImpl.createResource(URI.createFileURI("./samples/createResourceTest.wsdl")); - Assert.assertTrue("Resource is not of type WSDLResourceImpl", resource instanceof WSDLResourceImpl); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public void testWSDLResourceImpl() - { - try - { - WSDLResourceImpl resourceImpl = new WSDLResourceImpl(URI.createFileURI("./samples/createResourceTest.wsdl")); - Assert.assertTrue("Resource is not of type WSDLResourceImpl", resourceImpl instanceof WSDLResourceImpl); - - definition = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH + "samples/LoadAndPrintTest.wsdl"); - Assert.assertTrue(definition.eResource() instanceof WSDLResourceImpl); - Element element = definition.getElement(); - Document document = definition.getDocument(); - - if (element != null) - { - resourceImpl.serialize(System.out, element, null); - } - - if (document != null) - { - resourceImpl.serialize(System.out, document, null); - } - - try - { - resourceImpl.attached(definition); - } - catch (Exception e) - { - - } - - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public void testExtensibilityElementFactory() - { - try - { - ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory(SOAPConstants.SOAP_NAMESPACE_URI); - if (factory != null) - { - ExtensibilityElement ee = factory.createExtensibilityElement(SOAPConstants.SOAP_NAMESPACE_URI, SOAPConstants.HEADER_ELEMENT_TAG); - Assert.assertTrue("Problem creating SOAP extensibility element", ee instanceof SOAPHeader); - } - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - class TestExtensibilityElement extends ExtensibilityElementImpl implements ExtensibilityElement - { - String ns, name; - - public TestExtensibilityElement(String ns, String name) - { - super(); - this.ns = ns; - this.name = name; - } - - public QName getElementType() - { - if (elementType == null) - { - elementType = new QName(ns, name); - } - return elementType; - } - } - - class WSDLTestFactory implements ExtensibilityElementFactory - { - public WSDLTestFactory() - { - } - - public ExtensibilityElement createExtensibilityElement(String namespace, String localName) - { - return new TestExtensibilityElement(namespace, localName); - } - } - - public void testExtensibilityElementFactoryRegistry() - { - try - { - ExtensibilityElementFactoryRegistry factoryRegistry = WSDLPlugin.INSTANCE.getExtensibilityElementFactoryRegistry(); - factoryRegistry.registerFactory("http://org.eclipse.wst.wsdl.tests", new WSDLTestFactory()); - - ExtensibilityElementFactory factory = WSDLPlugin.INSTANCE.getExtensibilityElementFactory("http://org.eclipse.wst.wsdl.tests"); - ExtensibilityElement ee = factory.createExtensibilityElement("http://org.eclipse.wst.wsdl.tests", "TestElement"); - Assert.assertTrue("1. Problem creating custom Test extensibility element", ee instanceof TestExtensibilityElement); - Assert.assertTrue("2. Problem creating custom Test extensibility element", ee.getElementType().getLocalPart().equals("TestElement")); - Assert.assertTrue("3. Problem creating custom Test extensibility element", ee.getElementType().getNamespaceURI().equals("http://org.eclipse.wst.wsdl.tests")); - - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java deleted file mode 100644 index f13b19d00..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDL4JAPITest.java +++ /dev/null @@ -1,458 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import java.io.FileInputStream; -import java.net.URL; -import java.util.Iterator; - -import javax.wsdl.Binding; -import javax.wsdl.BindingFault; -import javax.wsdl.BindingInput; -import javax.wsdl.BindingOperation; -import javax.wsdl.BindingOutput; -import javax.wsdl.Definition; -import javax.wsdl.Fault; -import javax.wsdl.Import; -import javax.wsdl.Input; -import javax.wsdl.Message; -import javax.wsdl.Operation; -import javax.wsdl.Output; -import javax.wsdl.Part; -import javax.wsdl.Port; -import javax.wsdl.PortType; -import javax.wsdl.Service; -import javax.wsdl.Types; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.extensions.soap.SOAPBinding; -import javax.wsdl.extensions.soap.SOAPBody; -import javax.wsdl.extensions.soap.SOAPOperation; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.wsdl.xml.WSDLWriter; -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.runtime.IPluginDescriptor; -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.WSDLPlugin; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.tests.util.WSDL4JDefinitionVisitor; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Element; -import org.xml.sax.InputSource; - -/** - * @author Kihup Boo - */ -public class WSDL4JAPITest extends WSDL4JDefinitionVisitor -{ - private WSDLFactory factory = WSDLPlugin.INSTANCE.createWSDL4JFactory(); - private Definition newDefinition; - private Message currentMessage; - private Service currentService; - private PortType currentPortType; - private Operation currentOperation; - private Binding currentBinding; - private BindingOperation currentBindingOperation; - - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - // Added for JUnit - public WSDL4JAPITest(String name) - { - super(name); - } - - /** - * @param definition - */ - public WSDL4JAPITest(Definition definition) - { - super(definition); - } -/* - private void serialize(String filename) throws Exception - { - Source domSource = new DOMSource(doc); - Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT,"yes"); - transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4"); - transformer.transform(domSource,new StreamResult(new FileOutputStream(filename))); - } - - private void createDocument() throws ParserConfigurationException - { - doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - } - - private Element createWSDLElement(String name) - { - Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name); - if (wsdlNamespacePrefix != null) - element.setPrefix(wsdlNamespacePrefix); - - return element; - } - */ - private void visitDocumentation(Element docElement) - { - if (docElement == null) - return; - //println("documentation: " + docElement); - } - - private void println(String s) - { - System.out.println(s); - } - - protected void visitDefinition(Definition def) - { - newDefinition = factory.newDefinition(); - newDefinition.setDocumentationElement(def.getDocumentationElement()); - newDefinition.setQName(def.getQName()); - newDefinition.setTargetNamespace(def.getTargetNamespace()); - newDefinition.setDocumentBaseURI(def.getDocumentBaseURI()); - - Iterator iterator = def.getNamespaces().keySet().iterator(); - String prefix = null; - String namespace = null; - - while (iterator.hasNext()) - { - prefix = (String)iterator.next(); - namespace = def.getNamespace(prefix); - newDefinition.addNamespace(prefix,namespace); - } - - super.visitDefinition(def); - } - - protected void visitImport(Import wsdlImport) - { - Import myImport = newDefinition.createImport(); - newDefinition.addImport(myImport); - - // e.g. <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/> - myImport.setNamespaceURI(wsdlImport.getNamespaceURI()); - myImport.setLocationURI(wsdlImport.getLocationURI()); - myImport.setDocumentationElement(wsdlImport.getDocumentationElement()); - - myImport.setDefinition(newDefinition); - } - - protected void visitTypes(Types types) - { - Types myTypes = newDefinition.createTypes(); - myTypes.setDocumentationElement(types.getDocumentationElement()); - - Iterator iterator = types.getExtensibilityElements().iterator(); - /* - ExtensibilityElement ee = null; - while (iterator.hasNext()) - { - ee = (ExtensibilityElement)iterator.next(); - myTypes.addExtensibilityElement(ee); - }*/ - newDefinition.setTypes(myTypes); - } - - protected void visitPart(Part part) - { - Part myPart = newDefinition.createPart(); - myPart.setDocumentationElement(part.getDocumentationElement()); - myPart.setName(part.getName()); - myPart.setElementName(part.getElementName()); - myPart.setTypeName(part.getTypeName()); - - Iterator iterator = part.getExtensionAttributes().keySet().iterator(); - QName key = null; - QName value = null; - while (iterator.hasNext()) - { - key = (QName)iterator.next(); - value = (QName)part.getExtensionAttribute(key); - myPart.setExtensionAttribute(key,value); - } - currentMessage.addPart(myPart); - } - - protected void visitMessage(Message message) - { - currentMessage = newDefinition.createMessage(); - super.visitMessage(message); - } - - protected void visitPortType(PortType portType) - { - currentPortType = newDefinition.createPortType(); - currentPortType.setDocumentationElement(portType.getDocumentationElement()); - currentPortType.setQName(portType.getQName()); - currentPortType.setUndefined(portType.isUndefined()); - newDefinition.addPortType(currentPortType); - - super.visitPortType(portType); - } - - protected void visitOperation(Operation operation) - { - currentOperation = newDefinition.createOperation(); - currentOperation.setDocumentationElement(operation.getDocumentationElement()); - currentOperation.setName(operation.getName()); - currentOperation.setStyle(operation.getStyle()); - currentOperation.setUndefined(operation.isUndefined()); - currentOperation.setParameterOrdering(operation.getParameterOrdering()); - currentPortType.addOperation(currentOperation); - - super.visitOperation(operation); - } - - protected void visitInput(Input input) - { - Input myInput = newDefinition.createInput(); - myInput.setDocumentationElement(input.getDocumentationElement()); - myInput.setName(input.getName()); - myInput.setMessage(input.getMessage()); - currentOperation.setInput(myInput); - } - - protected void visitOutput(Output output) - { - Output myOutput = newDefinition.createOutput(); - myOutput.setDocumentationElement(output.getDocumentationElement()); - myOutput.setName(output.getName()); - myOutput.setMessage(output.getMessage()); - currentOperation.setOutput(myOutput); - } - - protected void visitFault(Fault fault) - { - Fault myFault = newDefinition.createFault(); - myFault.setDocumentationElement(fault.getDocumentationElement()); - myFault.setName(fault.getName()); - myFault.setMessage(fault.getMessage()); - currentOperation.addFault(myFault); - } - - protected void visitBinding(Binding binding) - { - currentBinding = newDefinition.createBinding(); - newDefinition.addBinding(currentBinding); - - currentBinding.setDocumentationElement(binding.getDocumentationElement()); - currentBinding.setQName(binding.getQName()); - currentBinding.setPortType(binding.getPortType()); - currentBinding.setUndefined(binding.isUndefined()); - - super.visitBinding(binding); - } - - protected void visitBindingOperation(BindingOperation bindingOperation) - { - currentBindingOperation = newDefinition.createBindingOperation(); - currentBindingOperation.setDocumentationElement(bindingOperation.getDocumentationElement()); - currentBindingOperation.setOperation(bindingOperation.getOperation()); - currentBindingOperation.setName(bindingOperation.getName()); - currentBinding.addBindingOperation(currentBindingOperation); - - super.visitBindingOperation(bindingOperation); - } - - protected void visitBindingInput(BindingInput input) - { - BindingInput myInput = newDefinition.createBindingInput(); - myInput.setDocumentationElement(input.getDocumentationElement()); - myInput.setName(input.getName()); - currentBindingOperation.setBindingInput(myInput); - - super.visitBindingInput(input); - } - - protected void visitBindingOutput(BindingOutput output) - { - BindingOutput myOutput = newDefinition.createBindingOutput(); - myOutput.setDocumentationElement(output.getDocumentationElement()); - myOutput.setName(output.getName()); - currentBindingOperation.setBindingOutput(myOutput); - - super.visitBindingOutput(output); - } - - protected void visitBindingFault(BindingFault fault) - { - BindingFault myFault = newDefinition.createBindingFault(); - myFault.setDocumentationElement(fault.getDocumentationElement()); - myFault.setName(fault.getName()); - currentBindingOperation.addBindingFault(myFault); - - super.visitBindingFault(fault); - } - - protected void visitService(Service service) - { - currentService = newDefinition.createService(); - currentService.setDocumentationElement(service.getDocumentationElement()); - currentService.setQName(service.getQName()); - newDefinition.addService(currentService); - - super.visitService(service); - } - - protected void visitPort(Port port) - { - Port myPort = newDefinition.createPort(); - myPort.setDocumentationElement(port.getDocumentationElement()); - myPort.setName(port.getName()); - myPort.setBinding(port.getBinding()); - currentService.addPort(myPort); - - super.visitPort(port); - } - - protected void visitExtensibilityElement(ExtensibilityElement extensibilityElement) - { - if (extensibilityElement instanceof SOAPBody) - visitSOAPBody((SOAPBody)extensibilityElement); - else if (extensibilityElement instanceof SOAPBinding) - visitSOAPBinding((SOAPBinding)extensibilityElement); - else if (extensibilityElement instanceof SOAPAddress) - visitSOAPAddress((SOAPAddress)extensibilityElement); - else if (extensibilityElement instanceof SOAPOperation) - visitSOAPOperation((SOAPOperation)extensibilityElement); - } - - // Need to improve this part - private boolean soapOperationVisited = false; - private void visitSOAPOperation(SOAPOperation soapOperation) - { - soapOperationVisited = true; - println("Visiting SOAPOperation..."); - println("soapAction: " + soapOperation.getSoapActionURI()); - println("Leaving SOAPOperation..."); - } - - //Needs to improve this part - private boolean soapBodyVisited = false; - private void visitSOAPBody(SOAPBody soapBody) - { - soapBodyVisited = true; - println("Visiting SOAPBody..."); - println("use: " + soapBody.getUse()); - println("Leaving SOAPBody..."); - } - - //Needs to improve this part - private boolean soapBindingVisited = false; - private void visitSOAPBinding(SOAPBinding soapBinding) - { - soapBindingVisited = true; - println("Visiting SOAPBinding..."); - println("style: " + soapBinding.getStyle()); - println("transport: " + soapBinding.getTransportURI()); - println("Leaving SOAPBinding..."); - } - - // Needs to improve this part - private boolean soapAddressVisited = false; - private void visitSOAPAddress(SOAPAddress soapAddress) - { - soapAddressVisited = true; - println("Visiting SOAPAddress..."); - println("location: " + soapAddress.getLocationURI()); - println("Leaving SOAPAddress..."); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new WSDL4JAPITest("ModelSemanticTest") - { - protected void runTest() - { - testModelSemantic(); - } - } - ); - return suite; - } - - public void testModelSemantic() - { - try - { - Definition def = loadDefinitionForWSDL4J("./samples/LoadAndPrintTest.wsdl"); - WSDL4JAPITest test = new WSDL4JAPITest(def); - test.visit(); - serialize(test.newDefinition,"./samples/ClonedLoadAndPrintTest.wsdl"); - } - catch (Exception e) - { - e.printStackTrace(); - Assert.fail(e.toString()); - } - } - - private void serialize(Definition def, String clonedFile) throws Exception - { - WSDLWriter writer = factory.newWSDLWriter(); - IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests"); - URL url = pd.getInstallURL(); - //System.out.println(url.toString()); - url = new URL(url,clonedFile); - //System.out.println(url.toString()); - //String s = Platform.resolve(url).getFile(); - //System.out.println(Platform.getInstanceLocation().getURL().toString()); - //String s = url.toString(); - //System.out.println(s); - //writer.writeWSDL(def,new FileOutputStream(s)); - } - - private Definition loadDefinitionForWSDL4J(String wsdlFile) throws Exception - { - WSDLReader reader = factory.newWSDLReader(); - IPluginDescriptor pd = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.wst.wsdl.tests"); - URL url = pd.getInstallURL(); - url = new URL(url,wsdlFile); - String s = Platform.resolve(url).getFile(); - //System.out.println("loading " + s); - Definition definition = reader.readWSDL(s,new InputSource(new FileInputStream(s))); - return definition; - } - - public static void main(String[] args) - { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java deleted file mode 100644 index e5a4aa9d4..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLEMFAPITest.java +++ /dev/null @@ -1,612 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import java.util.Iterator; - -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingFault; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.ExtensibleElement; -import org.eclipse.wst.wsdl.Fault; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.MessageReference; -import org.eclipse.wst.wsdl.Namespace; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.Types; -import org.eclipse.wst.wsdl.UnknownExtensibilityElement; -import org.eclipse.wst.wsdl.WSDLElement; -import org.eclipse.wst.wsdl.WSDLFactory; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.WSDLPlugin; -import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement; -import org.eclipse.wst.wsdl.binding.soap.SOAPAddress; -import org.eclipse.wst.wsdl.binding.soap.SOAPBinding; -import org.eclipse.wst.wsdl.binding.soap.SOAPBody; -import org.eclipse.wst.wsdl.binding.soap.SOAPFactory; -import org.eclipse.wst.wsdl.binding.soap.SOAPFault; -import org.eclipse.wst.wsdl.binding.soap.SOAPHeader; -import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase; -import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault; -import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.tests.util.DefinitionLoader; -import org.eclipse.wst.wsdl.tests.util.DefinitionVisitor; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Element; - -/** - * @author Kihup Boo - */ -public class WSDLEMFAPITest extends DefinitionVisitor -{ - private String PLUGIN_ABSOLUTE_PATH = WSDLTestsPlugin.getInstallURL(); - private WSDLFactory factory = WSDLFactory.eINSTANCE; - - Definition newDefinition; - private Message currentMessage; - private Service currentService; - private PortType currentPortType; - private Operation currentOperation; - private Binding currentBinding; - private BindingOperation currentBindingOperation; - private ExtensibleElement currentExtensibleElement; - - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - // Added for JUnit - public WSDLEMFAPITest(String name) - { - super(name); - } - - /** - * @param definition - */ - public WSDLEMFAPITest(Definition definition) - { - super(definition); - } -/* - private void serialize(String filename) throws Exception - { - Source domSource = new DOMSource(doc); - Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT,"yes"); - transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4"); - transformer.transform(domSource,new StreamResult(new FileOutputStream(filename))); - } - - private void createDocument() throws ParserConfigurationException - { - doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - } - - private Element createWSDLElement(String name) - { - Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name); - if (wsdlNamespacePrefix != null) - element.setPrefix(wsdlNamespacePrefix); - - return element; - } - */ - private void visitDocumentation(Element docElement) - { - if (docElement == null) - return; - println("documentation: " + docElement); // TBD - serialize docElement - } - - private void println(String s) - { - System.out.println(s); - } - - protected void visitDefinition(Definition def) - { - // Use WSDLElement to increase the API coverage in the reports - WSDLElement root = factory.createDefinition(); - newDefinition = (Definition)root; - - root.setDocumentationElement(def.getDocumentationElement()); - root.getDocumentationElement(); - root.setEnclosingDefinition(newDefinition); - root.getEnclosingDefinition(); - root.getContainer(); - - newDefinition.setQName(def.getQName()); - newDefinition.setTargetNamespace(def.getTargetNamespace()); - newDefinition.setDocumentBaseURI(def.getDocumentBaseURI()); - newDefinition.setLocation(def.getLocation()); - newDefinition.setEncoding(def.getEncoding()); - - // getENamespaces does not work. - Iterator iterator = def.getENamespaces().iterator(); - Namespace ns = null; - String prefix = null; - String uri = null; - while (iterator.hasNext()) - { - ns = factory.createNamespace(); - prefix = ((Namespace)iterator.next()).getPrefix(); - uri = ((Namespace)iterator.next()).getURI(); - ns.setURI(uri); - ns.setPrefix(prefix); - newDefinition.getENamespaces().add(ns); - } - - iterator = def.getNamespaces().keySet().iterator(); - prefix = null; - String namespace = null; - - while (iterator.hasNext()) - { - prefix = (String)iterator.next(); - namespace = def.getNamespace(prefix); - newDefinition.addNamespace(prefix,namespace); - } - //newDefinition.updateElement(); - - currentExtensibleElement = def; - super.visitDefinition(def); - - root.setElement(null); - root.updateElement(true); - root.getElement(); - root.setElement(null); - root.updateElement(); - } - - protected void visitImport(Import wsdlImport) - { - Import myImport = factory.createImport(); - newDefinition.getEImports().add(myImport); - - // e.g. <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/> - myImport.setNamespaceURI(wsdlImport.getNamespaceURI()); - myImport.setLocationURI(wsdlImport.getLocationURI()); - myImport.setDocumentationElement(wsdlImport.getDocumentationElement()); - myImport.setEDefinition(newDefinition); - myImport.setESchema(wsdlImport.getESchema()); - myImport.setSchema(wsdlImport.getSchema()); // TBD - review - myImport.setEnclosingDefinition(newDefinition); - } - - protected void visitTypes(Types types) - { - Types myTypes = factory.createTypes(); - myTypes.setDocumentationElement(types.getDocumentationElement()); - - Iterator iterator = types.getEExtensibilityElements().iterator(); - ExtensibilityElement ee = null; - types.getSchemas("http://tempuri.org/LoadAndPrintTest/"); - - currentExtensibleElement = myTypes; - while (iterator.hasNext()) - { - ee = (ExtensibilityElement)iterator.next(); - visitExtensibilityElement(ee); - } - - myTypes.setEnclosingDefinition(newDefinition); - newDefinition.getETypes(); - newDefinition.setETypes(myTypes); - } - - protected void visitPart(Part part) - { - Part myPart = factory.createPart(); - myPart.setDocumentationElement(part.getDocumentationElement()); - myPart.setName(part.getName()); - myPart.setElementName(part.getElementName()); - myPart.setTypeName(part.getTypeName()); - myPart.setEMessage(part.getEMessage()); - myPart.setElementDeclaration(part.getElementDeclaration()); - myPart.setTypeDefinition(part.getTypeDefinition()); - - Iterator iterator = part.getExtensionAttributes().keySet().iterator(); - QName key = null; - QName value = null; - while (iterator.hasNext()) - { - key = (QName)iterator.next(); - value = (QName)part.getExtensionAttribute(key); - myPart.setExtensionAttribute(key,value); - } - currentMessage.setEnclosingDefinition(newDefinition); - currentMessage.addPart(myPart); - } - - protected void visitPortType(PortType portType) - { - currentPortType = factory.createPortType(); - currentPortType.setDocumentationElement(portType.getDocumentationElement()); - currentPortType.setQName(portType.getQName()); - currentPortType.setUndefined(portType.isUndefined()); - - currentPortType.setEnclosingDefinition(newDefinition); - newDefinition.getEPortTypes().add(currentPortType); - - super.visitPortType(portType); - } - - protected void visitOperation(Operation operation) - { - currentOperation = factory.createOperation(); - currentOperation.setDocumentationElement(operation.getDocumentationElement()); - currentOperation.setName(operation.getName()); - currentOperation.setStyle(operation.getStyle()); - currentOperation.setUndefined(operation.isUndefined()); - operation.getEParameterOrdering(); // TBD - currentOperation.setEnclosingDefinition(newDefinition); - currentPortType.getEOperations().add(currentOperation); - - super.visitOperation(operation); - //System.out.println("Operation Type is: " + operation.getStyle()); - //operation.setStyle(OperationType.REQUEST_RESPONSE); - //System.out.println("Operation Type is: " + operation.getStyle()); - } - - protected void visitMessage(Message message) - { - currentMessage = factory.createMessage(); - currentMessage.setQName(message.getQName()); - currentMessage.setUndefined(message.isUndefined()); - newDefinition.addMessage(currentMessage); - - super.visitMessage(message); - } - - protected void visitInput(Input input) - { - MessageReference myInput = factory.createInput(); - myInput.setDocumentationElement(input.getDocumentationElement()); - myInput.setName(input.getName()); - myInput.getName(); - myInput.setEMessage(input.getEMessage()); - myInput.setEnclosingDefinition(newDefinition); - currentOperation.setEInput((Input)myInput); - } - - protected void visitOutput(Output output) - { - Output myOutput = factory.createOutput(); - myOutput.setDocumentationElement(output.getDocumentationElement()); - myOutput.setName(output.getName()); - myOutput.setEMessage(output.getEMessage()); - myOutput.setEnclosingDefinition(newDefinition); - currentOperation.setEOutput(myOutput); - } - - protected void visitFault(Fault fault) - { - Fault myFault = factory.createFault(); - myFault.setDocumentationElement(fault.getDocumentationElement()); - myFault.setName(fault.getName()); - myFault.setEMessage(fault.getEMessage()); - myFault.setEnclosingDefinition(newDefinition); - currentOperation.getEFaults().add(myFault); - } - - protected void visitBinding(Binding binding) - { - currentBinding = factory.createBinding(); - newDefinition.getEBindings().add(currentBinding); - - currentBinding.setDocumentationElement(binding.getDocumentationElement()); - currentBinding.setQName(binding.getQName()); - currentBinding.setEPortType(binding.getEPortType()); - currentBinding.setUndefined(binding.isUndefined()); - - currentExtensibleElement = currentBinding; - super.visitBinding(binding); - } - - protected void visitBindingOperation(BindingOperation bindingOperation) - { - currentBindingOperation = factory.createBindingOperation(); - currentBindingOperation.setDocumentationElement(bindingOperation.getDocumentationElement()); - currentBindingOperation.setEOperation(bindingOperation.getEOperation()); - currentBindingOperation.setName(bindingOperation.getName()); - currentBinding.getBindingOperations().add(currentBindingOperation); - - currentExtensibleElement = currentBindingOperation; - super.visitBindingOperation(bindingOperation); - } - - protected void visitBindingInput(BindingInput input) - { - BindingInput myInput = factory.createBindingInput(); - myInput.setDocumentationElement(input.getDocumentationElement()); - myInput.setName(input.getName()); - myInput.setInput(input.getInput()); - myInput.setEInput(input.getEInput()); - currentBindingOperation.setEBindingInput(myInput); - - currentExtensibleElement = myInput; - super.visitBindingInput(input); - } - - protected void visitBindingOutput(BindingOutput output) - { - BindingOutput myOutput = factory.createBindingOutput(); - myOutput.setDocumentationElement(output.getDocumentationElement()); - myOutput.setName(output.getName()); - myOutput.setOutput(output.getOutput()); - myOutput.setEOutput(output.getEOutput()); - currentBindingOperation.setEBindingOutput(myOutput); - - currentExtensibleElement = myOutput; - super.visitBindingOutput(output); - } - - protected void visitBindingFault(BindingFault fault) - { - BindingFault myFault = factory.createBindingFault(); - myFault.setDocumentationElement(fault.getDocumentationElement()); - myFault.setName(fault.getName()); - myFault.setEFault(fault.getEFault()); - myFault.setFault(fault.getFault()); - currentBindingOperation.getEBindingFaults().add(myFault); - - currentExtensibleElement = myFault; - super.visitBindingFault(fault); - } - - protected void visitService(Service service) - { - currentService = factory.createService(); - currentService.setDocumentationElement(service.getDocumentationElement()); - currentService.setQName(service.getQName()); - currentService.setUndefined(service.isUndefined()); - - newDefinition.getEServices().add(currentService); - - super.visitService(service); - } - - protected void visitPort(Port port) - { - Port myPort = factory.createPort(); - myPort.setDocumentationElement(port.getDocumentationElement()); - myPort.setName(port.getName()); - myPort.setEBinding(port.getEBinding()); - - currentService.getEPorts().add(myPort); - - currentExtensibleElement = myPort; - super.visitPort(port); - } - - protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement) - { - // To move up the API test coverage - owner.getEExtensibilityElements(); - owner.getExtensibilityElements(); - factory.createExtensibilityElement(); - WSDLPlugin.getPlugin(); - WSDLPlugin.INSTANCE.getPluginResourceLocator(); - - visitExtensibilityElement(extensibilityElement); - } - - private void visitExtensibilityElement(ExtensibilityElement extensibilityElement) - { - XSDSchemaExtensibilityElement xsee = null; - UnknownExtensibilityElement uee = null; - ExtensibilityElement myEE = null; - if (extensibilityElement instanceof XSDSchemaExtensibilityElement) - { - myEE = factory.createXSDSchemaExtensibilityElement(); - xsee = (XSDSchemaExtensibilityElement)myEE; - xsee.setSchema(((XSDSchemaExtensibilityElement)extensibilityElement).getSchema()); - } - else - { - myEE = factory.createUnknownExtensibilityElement(); - uee = (UnknownExtensibilityElement)myEE; - uee.getChildren(); // TBD - } - myEE.setElementType(extensibilityElement.getElementType()); - myEE.setRequired(extensibilityElement.getRequired()); - myEE.setRequired(extensibilityElement.isRequired()); - if (currentExtensibleElement != null) - currentExtensibleElement.addExtensibilityElement(myEE); - - if (extensibilityElement instanceof SOAPBody) - visitSOAPBody((SOAPBody)extensibilityElement); - else if (extensibilityElement instanceof SOAPBinding) - visitSOAPBinding((SOAPBinding)extensibilityElement); - else if (extensibilityElement instanceof SOAPAddress) - visitSOAPAddress((SOAPAddress)extensibilityElement); - else if (extensibilityElement instanceof SOAPOperation) - visitSOAPOperation((SOAPOperation)extensibilityElement); - else if (extensibilityElement instanceof SOAPFault) - visitSOAPFault((SOAPFault)extensibilityElement); - else if (extensibilityElement instanceof SOAPHeader) - visitSOAPHeader((SOAPHeader)extensibilityElement); - else if (extensibilityElement instanceof SOAPHeaderFault) - visitSOAPHeaderFault((SOAPHeaderFault)extensibilityElement); - } - - - private void visitSOAPFault(SOAPFault soapFault) - { - SOAPFault mySoapFault = SOAPFactory.eINSTANCE.createSOAPFault(); - mySoapFault.setEncodingStyles(soapFault.getEncodingStyles()); - mySoapFault.setName(soapFault.getName()); - mySoapFault.setNamespaceURI(soapFault.getNamespaceURI()); - mySoapFault.setUse(soapFault.getUse()); - } - - private void visitSOAPHeader(SOAPHeader soapHeader) - { - // Use SOAPHeaderBase to increase the API coverage values in the reports - - SOAPHeaderBase yourSoapHeader = SOAPFactory.eINSTANCE.createSOAPHeaderBase(); - yourSoapHeader.getEncodingStyles(); - - SOAPHeaderBase mySoapHeader = SOAPFactory.eINSTANCE.createSOAPHeader(); - mySoapHeader.setMessage(soapHeader.getMessage()); - mySoapHeader.getMessage(); - mySoapHeader.setPart(soapHeader.getPart()); - mySoapHeader.getPart(); - mySoapHeader.setNamespaceURI(soapHeader.getNamespaceURI()); - mySoapHeader.getNamespaceURI(); - mySoapHeader.setUse(soapHeader.getUse()); - mySoapHeader.getUse(); - ((SOAPHeader)soapHeader).getHeaderFaults(); // TBD - } - - private void visitSOAPHeaderFault(SOAPHeaderFault soapHeaderFault) - { - SOAPHeaderFault mySoapHeaderFault = SOAPFactory.eINSTANCE.createSOAPHeaderFault(); - mySoapHeaderFault.setMessage(soapHeaderFault.getMessage()); - mySoapHeaderFault.setPart(soapHeaderFault.getPart()); - mySoapHeaderFault.setNamespaceURI(soapHeaderFault.getNamespaceURI()); - mySoapHeaderFault.setUse(soapHeaderFault.getUse()); - } - - private boolean soapOperationVisited = false; - private void visitSOAPOperation(SOAPOperation soapOperation) - { - soapOperationVisited = true; - SOAPOperation mySoapOperation = SOAPFactory.eINSTANCE.createSOAPOperation(); - mySoapOperation.setSoapActionURI(soapOperation.getSoapActionURI()); - mySoapOperation.setStyle(soapOperation.getStyle()); - } - - //Needs to improve this part - private boolean soapBodyVisited = false; - private void visitSOAPBody(SOAPBody soapBody) - { - soapBodyVisited = true; - SOAPBody mySoapBody = SOAPFactory.eINSTANCE.createSOAPBody(); - mySoapBody.setEncodingStyles(soapBody.getEncodingStyles()); - mySoapBody.setNamespaceURI(soapBody.getNamespaceURI()); - mySoapBody.setParts(soapBody.getParts()); - mySoapBody.setUse(soapBody.getUse()); - } - - //Needs to improve this part - private boolean soapBindingVisited = false; - private void visitSOAPBinding(SOAPBinding soapBinding) - { - soapBindingVisited = true; - SOAPBinding mySoapBinding = SOAPFactory.eINSTANCE.createSOAPBinding(); - mySoapBinding.setStyle(soapBinding.getStyle()); - mySoapBinding.setTransportURI(soapBinding.getTransportURI()); - } - - // Needs to improve this part - private boolean soapAddressVisited = false; - private void visitSOAPAddress(SOAPAddress soapAddress) - { - soapAddressVisited = true; - SOAPAddress mySoapAddress = SOAPFactory.eINSTANCE.createSOAPAddress(); - mySoapAddress.setLocationURI(soapAddress.getLocationURI()); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new WSDLEMFAPITest("ModelSemanticTest") - { - protected void runTest() - { - testModelSemantic(); - } - } - ); - return suite; - } - - public void testModelSemantic() - { - try - { - Definition def = DefinitionLoader.load(PLUGIN_ABSOLUTE_PATH +"samples/LoadAndPrintTest.wsdl",true); - WSDLEMFAPITest test = new WSDLEMFAPITest(def); - test.visit(); - serialize(test.newDefinition); - } - catch (Exception e) - { - e.printStackTrace(); - Assert.fail(e.toString()); - } - } - - private void serialize(Definition def) throws Exception - { - ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl")); - wsdlMainResource.getContents().add(def); - - IWorkspaceRoot myWorkspaceRoot = ResourcesPlugin.getWorkspace().getRoot(); - IProject myWebProject = myWorkspaceRoot.getProject("org.eclipse.wst.wsdl.tests"); - if (!myWebProject.exists()) - myWebProject.create(null); - - String baseDir = myWebProject.getLocation().toString(); - - DefinitionLoader.store(def,baseDir + "/ClonedLoadAndPrintTest.wsdl"); - } - - public static void main(String[] args) - { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java deleted file mode 100644 index 26a0fe153..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java +++ /dev/null @@ -1,260 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests; - -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.WSDLFactory; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.binding.soap.SOAPAddress; -import org.eclipse.wst.wsdl.binding.soap.SOAPBinding; -import org.eclipse.wst.wsdl.binding.soap.SOAPBody; -import org.eclipse.wst.wsdl.binding.soap.SOAPFactory; -import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLConstants; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; - -public class WSDLGenerationTest extends TestCase -{ - public WSDLGenerationTest() - { - init(); - } - - public WSDLGenerationTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new WSDLGenerationTest("SampleWSDLGeneration") - { - protected void runTest() - { - testSampleWSDLGeneration(); - } - } - ); - - return suite; - } - - public void testSampleWSDLGeneration() - { - try - { - generateTemperatureService("./TemperatureService.wsdl"); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - protected void setUp() throws Exception - { - super.setUp(); - - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - - public void generateTemperatureService(String outputFile) throws Exception - { - ResourceSet resourceSet = new ResourceSetImpl(); - Resource resource = resourceSet.createResource(URI.createFileURI(outputFile)); - resourceSet.getResources().add(resource); - - // Create a Definition - Temperature - Definition definition = WSDLFactory.eINSTANCE.createDefinition(); - definition.setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI,"Temparature")); - resource.getContents().add(definition); - - // Target namespace - http://www.temperature.com - definition.setTargetNamespace("http://www.temperature.com"); - definition.addNamespace("tns", "http://www.temperature.com"); - - // Other namespaces - wsdl, soap, xsd - definition.addNamespace("wsdl", WSDLConstants.WSDL_NAMESPACE_URI); - definition.addNamespace("xsd", WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001); - definition.getNamespaces().put("soap", SOAPConstants.SOAP_NAMESPACE_URI); - - // - // Let's start building two messages - // - - // Create a Part - ZipCode - Part part = WSDLFactory.eINSTANCE.createPart(); - part.setName("ZipCode"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string")); - - // Create a Message - GetTemperatureInput - Message inputMessage = WSDLFactory.eINSTANCE.createMessage(); - inputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInput")); - inputMessage.addPart(part); - definition.addMessage(inputMessage); - - // Create a Part - Temperature - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Temperature"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float")); - - // Create a Message - GetTemperatureOutput - Message outputMessage = WSDLFactory.eINSTANCE.createMessage(); - outputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureOutput")); - outputMessage.addPart(part); - definition.addMessage(outputMessage); - - // - // Next, build a PortType - // - - // Create an Input - GetTemperatureInput - Input input = WSDLFactory.eINSTANCE.createInput(); - input.setMessage(inputMessage); - - // Create an Output - GetTemperatureOutput - Output output = WSDLFactory.eINSTANCE.createOutput(); - output.setMessage(outputMessage); - - // Create an Operation - GetTemperatureForZipCode - Operation operation = WSDLFactory.eINSTANCE.createOperation(); - operation.setName("GetTemperatureForZipCode"); - operation.setInput(input); - operation.setOutput(output); - - // Create a PortType - PortType portType = WSDLFactory.eINSTANCE.createPortType(); - portType.setQName(new QName(definition.getTargetNamespace(),"GetTemparatureInfoSOAP")); - portType.addOperation(operation); - definition.addPortType(portType); - - // - // Now, let's work on Binding - // - - // Create a Binding - GetTemperatureInfoSOAP - Binding binding = WSDLFactory.eINSTANCE.createBinding(); - binding.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInfoSOAP")); - binding.setPortType(portType); - definition.addBinding(binding); - - // Create a SOAP Binding - SOAPBinding soapBinding = SOAPFactory.eINSTANCE.createSOAPBinding(); - soapBinding.setStyle("rpc"); - soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http"); - binding.addExtensibilityElement(soapBinding); - - // Create a Binding Operation - BindingOperation bindingOperation = WSDLFactory.eINSTANCE.createBindingOperation(); - bindingOperation.setName("GetTemperatureForZipCode"); - binding.addBindingOperation(bindingOperation); - - // Create a SOAP Operation - SOAPOperation soapOperation = SOAPFactory.eINSTANCE.createSOAPOperation(); - soapOperation.setSoapActionURI("http://www.temperature.com/GetTemperatureForZipCode"); - bindingOperation.addExtensibilityElement(soapOperation); - - // Create a SOAP Body - SOAPBody soapBody = SOAPFactory.eINSTANCE.createSOAPBody(); - soapBody.setUse("encoded"); - soapBody.getEncodingStyles().add("http://schemas.xmlsoap.org/soap/encoding/"); - soapBody.setNamespaceURI("http://www.temperature.com/"); - - // Create a Binding Input - BindingInput bindingInput = WSDLFactory.eINSTANCE.createBindingInput(); - bindingInput.addExtensibilityElement(soapBody); - bindingOperation.setBindingInput(bindingInput); - - // Create a SOAP Body - soapBody = SOAPFactory.eINSTANCE.createSOAPBody(); - soapBody.setUse("encoded"); - soapBody.getEncodingStyles().add("http://schemas.xmlsoap.org/soap/encoding/"); - soapBody.setNamespaceURI("http://www.temperature.com/"); - - // Create a Binding Output - BindingOutput bindingOuput = WSDLFactory.eINSTANCE.createBindingOutput(); - bindingOuput.addExtensibilityElement(soapBody); - bindingOperation.setBindingOutput(bindingOuput); - - // - // Finally, we are building a Service - // - - // Create a SOAP Address - SOAPAddress soapAddress = SOAPFactory.eINSTANCE.createSOAPAddress(); - soapAddress.setLocationURI("http://todo-some-address/"); - - // Create a Port - GetTemperatureInfoSOAP - Port port = WSDLFactory.eINSTANCE.createPort(); - port.setName("GetTemperatureInfoSOAP"); - port.setBinding(binding); - port.addExtensibilityElement(soapAddress); - - // Create a Service - TemperatureService - Service service = WSDLFactory.eINSTANCE.createService(); - service.setQName(new QName(definition.getTargetNamespace(),"TemperatureService")); - service.addPort(port); - definition.addService(service); - - // - // Phew, we are done. Let's serialize it. - // - - resource.save(null); - - } - - private void init() - { - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java deleted file mode 100644 index 0bb5f4f5b..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java +++ /dev/null @@ -1,109 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -import java.io.IOException; -import java.util.*; - -/** - * The main plugin class to be used in the desktop. - */ -public class WSDLTestsPlugin extends Plugin { - //The shared instance. - private static WSDLTestsPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - private static Bundle pluginBundle = null; - - /** - * The constructor. - */ - public WSDLTestsPlugin() { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - pluginBundle = context.getBundle(); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - resourceBundle = null; - pluginBundle = context.getBundle(); - } - - /** - * Returns the shared instance. - */ - public static WSDLTestsPlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = WSDLTestsPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wsdl.tests.WSDLTestsPluginResources"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } - - /** - * Get the install URL of this plugin. - * - * @return the install url of this plugin - */ - public static String getInstallURL() - { - try - { - return Platform.resolve(pluginBundle.getEntry("/")).getFile(); - } - catch (IOException e) - { - return null; - } - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java deleted file mode 100644 index 674386bcb..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import java.io.IOException; -import java.util.Hashtable; -import java.util.Iterator; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; - -/** - * @author Kihup Boo - */ -public final class DefinitionLoader -{ - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - /** - * This class provides static methods only. - */ - private DefinitionLoader() - { - } - - static public Definition load(String filename) throws IOException - { - return load(filename,false); - } - - static public Definition load(String filename, boolean useExtensionFactories) throws IOException - { - // filename is an absolute path - - URI uri = null; - uri = URI.createFileURI(filename); - - ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getAdapterFactories().add(new WSDLModelLocatorAdapterFactory()); - resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory()); - - WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl")); - wsdlMainResource.setURI(uri); - java.util.Map map = new Hashtable(); - map.put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,Boolean.valueOf(true)); - map.put(WSDLResourceImpl.USE_EXTENSION_FACTORIES,Boolean.valueOf(useExtensionFactories)); - wsdlMainResource.load(map); - - Definition definition = null; - for (Iterator resources = resourceSet.getResources().iterator(); resources.hasNext(); ) - { - Object resource = resources.next(); - if (resource instanceof WSDLResourceImpl) - { - WSDLResourceImpl wsdlResource = (WSDLResourceImpl)resource; - definition = wsdlResource.getDefinition(); - return definition; - } - } - - return null; - } - - static public void store(Definition definition, String filename) throws IOException - { - // filename is an absolute path - - Resource resource = definition.eResource(); - resource.setURI(URI.createFileURI(filename)); - resource.save(null); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java deleted file mode 100644 index 4b139a6f2..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java +++ /dev/null @@ -1,211 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import java.util.Iterator; - -import junit.framework.TestCase; - -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingFault; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.ExtensibleElement; -import org.eclipse.wst.wsdl.Fault; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.Types; - -/** - * @author Kihup Boo - */ -public abstract class DefinitionVisitor extends TestCase -{ - protected Definition definition; - - /** - * Use DefinitionVisitor(Definition definition) - */ - private DefinitionVisitor() - { - } - - // Added for JUnit - public DefinitionVisitor(String name) - { - super(name); - } - - protected DefinitionVisitor(Definition definition) - { - this.definition = definition; - } - - // main entry - public void visit() - { - visitDefinition(definition); - } - - protected void visitDefinition(Definition def) - { - Iterator iterator = def.getEImports().iterator(); - while (iterator.hasNext()) - visitImport((Import)iterator.next()); - - Types types = def.getETypes(); - if (types != null) - visitTypes(types); - - iterator = def.getEMessages().iterator(); - while (iterator.hasNext()) - visitMessage((Message)iterator.next()); - - iterator = def.getEPortTypes().iterator(); - while (iterator.hasNext()) - visitPortType((PortType)iterator.next()); - - iterator = def.getEBindings().iterator(); - while (iterator.hasNext()) - visitBinding((Binding)iterator.next()); - - iterator = def.getEServices().iterator(); - while (iterator.hasNext()) - visitService((Service)iterator.next()); - - iterator = def.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(def,(ExtensibilityElement)iterator.next()); - - } - - abstract protected void visitImport(Import wsdlImport); - - abstract protected void visitTypes(Types types); - - protected void visitMessage(Message message) - { - Iterator iterator = message.getEParts().iterator(); - while (iterator.hasNext()) - visitPart((Part)iterator.next()); - } - - abstract protected void visitPart(Part part); - - protected void visitPortType(PortType portType) - { - Iterator iterator = portType.getEOperations().iterator(); - while (iterator.hasNext()) - visitOperation((Operation)iterator.next()); - } - - protected void visitOperation(Operation operation) - { - Input input = operation.getEInput(); - visitInput((Input)input); - - Output output = operation.getEOutput(); - visitOutput((Output)output); - - Iterator iterator = operation.getEFaults().iterator(); - while (iterator.hasNext()) - visitFault((Fault)iterator.next()); - } - - protected abstract void visitInput(Input input); - - protected abstract void visitOutput(Output output); - - protected abstract void visitFault(Fault fault); - - protected void visitBinding(Binding binding) - { - Iterator iterator = binding.getEBindingOperations().iterator(); - while (iterator.hasNext()) - visitBindingOperation((BindingOperation)iterator.next()); - - iterator = binding.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(binding,(ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOperation(BindingOperation operation) - { - BindingInput input = operation.getEBindingInput(); - visitBindingInput((BindingInput)input); - - BindingOutput output = operation.getEBindingOutput(); - visitBindingOutput((BindingOutput)output); - - Iterator iterator = operation.getEBindingFaults().iterator(); - while (iterator.hasNext()) - visitBindingFault((BindingFault)iterator.next()); - - iterator = operation.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(operation,(ExtensibilityElement)iterator.next()); - - } - - protected void visitBindingInput(BindingInput input) - { - Iterator iterator = input.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(input,(ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOutput(BindingOutput output) - { - Iterator iterator = output.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(output,(ExtensibilityElement)iterator.next()); - } - - protected void visitBindingFault(BindingFault fault) - { - Iterator iterator = fault.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(fault,(ExtensibilityElement)iterator.next()); - } - - protected void visitService(Service service) - { - Iterator iterator = service.getEPorts().iterator(); - while (iterator.hasNext()) - visitPort((Port)iterator.next()); - - iterator = service.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(service,(ExtensibilityElement)iterator.next()); - } - - protected void visitPort(Port port) - { - Iterator iterator = port.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(port,(ExtensibilityElement)iterator.next()); - } - - abstract protected void visitExtensibilityElement - (ExtensibleElement owner, - ExtensibilityElement extensibilityElement); - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java deleted file mode 100644 index f11cd19d8..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java +++ /dev/null @@ -1,208 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import java.util.Iterator; - -import javax.wsdl.Binding; -import javax.wsdl.BindingFault; -import javax.wsdl.BindingInput; -import javax.wsdl.BindingOperation; -import javax.wsdl.BindingOutput; -import javax.wsdl.Definition; -import javax.wsdl.Fault; -import javax.wsdl.Import; -import javax.wsdl.Input; -import javax.wsdl.Message; -import javax.wsdl.Operation; -import javax.wsdl.Output; -import javax.wsdl.Part; -import javax.wsdl.Port; -import javax.wsdl.PortType; -import javax.wsdl.Service; -import javax.wsdl.Types; -import javax.wsdl.extensions.ExtensibilityElement; - -import junit.framework.TestCase; - -/** - * @author Kihup Boo - */ -public abstract class WSDL4JDefinitionVisitor extends TestCase -{ - protected Definition definition; - - /** - * Use DefinitionVisitor(Definition definition) - */ - private WSDL4JDefinitionVisitor() - { - } - - // Added for JUnit - public WSDL4JDefinitionVisitor(String name) - { - super(name); - } - - protected WSDL4JDefinitionVisitor(Definition definition) - { - this.definition = definition; - } - - // main entry - public void visit() - { - visitDefinition(definition); - } - - protected void visitDefinition(Definition def) - { - Iterator iterator = def.getImports().entrySet().iterator(); - while (iterator.hasNext()) - visitImport((Import)iterator.next()); - - Types types = def.getTypes(); - if (types != null) - visitTypes(types); - - iterator = def.getMessages().values().iterator(); - while (iterator.hasNext()) - visitMessage((Message)iterator.next()); - - iterator = def.getPortTypes().values().iterator(); - while (iterator.hasNext()) - visitPortType((PortType)iterator.next()); - - iterator = def.getBindings().values().iterator(); - while (iterator.hasNext()) - visitBinding((Binding)iterator.next()); - - iterator = def.getServices().values().iterator(); - while (iterator.hasNext()) - visitService((Service)iterator.next()); - - iterator = def.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - - } - - abstract protected void visitImport(Import wsdlImport); - - abstract protected void visitTypes(Types types); - - protected void visitMessage(Message message) - { - Iterator iterator = message.getParts().values().iterator(); - while (iterator.hasNext()) - visitPart((Part)iterator.next()); - } - - abstract protected void visitPart(Part part); - - protected void visitPortType(PortType portType) - { - Iterator iterator = portType.getOperations().iterator(); - while (iterator.hasNext()) - visitOperation((Operation)iterator.next()); - } - - protected void visitOperation(Operation operation) - { - Input input = operation.getInput(); - visitInput((Input)input); - - Output output = operation.getOutput(); - visitOutput((Output)output); - - Iterator iterator = operation.getFaults().entrySet().iterator(); - while (iterator.hasNext()) - visitFault((Fault)iterator.next()); - } - - protected abstract void visitInput(Input input); - - protected abstract void visitOutput(Output output); - - protected abstract void visitFault(Fault fault); - - protected void visitBinding(Binding binding) - { - Iterator iterator = binding.getBindingOperations().iterator(); - while (iterator.hasNext()) - visitBindingOperation((BindingOperation)iterator.next()); - - iterator = binding.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOperation(BindingOperation operation) - { - BindingInput input = operation.getBindingInput(); - visitBindingInput((BindingInput)input); - - BindingOutput output = operation.getBindingOutput(); - visitBindingOutput((BindingOutput)output); - - Iterator iterator = operation.getBindingFaults().entrySet().iterator(); - while (iterator.hasNext()) - visitBindingFault((BindingFault)iterator.next()); - - iterator = operation.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - - } - - protected void visitBindingInput(BindingInput input) - { - Iterator iterator = input.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOutput(BindingOutput output) - { - Iterator iterator = output.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitBindingFault(BindingFault fault) - { - Iterator iterator = fault.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitService(Service service) - { - Iterator iterator = service.getPorts().values().iterator(); - while (iterator.hasNext()) - visitPort((Port)iterator.next()); - - iterator = service.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitPort(Port port) - { - Iterator iterator = port.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - abstract protected void visitExtensibilityElement(ExtensibilityElement extensibilityElement); - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java deleted file mode 100644 index 9247256d4..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java +++ /dev/null @@ -1,608 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import java.io.FileOutputStream; -import java.util.Iterator; - -import javax.wsdl.OperationType; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingFault; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.ExtensibleElement; -import org.eclipse.wst.wsdl.Fault; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.MessageReference; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.Types; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -/** - * @author Kihup Boo - */ -public class WSDLConverter extends DefinitionVisitor -{ - private Document doc; - private Element description; - private Element currentTypes; - private Element currentService; - private Element currentEndpoint; - private Element currentInterface; - private Element currentOperation; - - private Element currentBinding; - private Element currentBindingOperation; - private Element currentBindingInput; - private Element currentBindingOutput; - private Element currentBindingFault; - - private String wsdlNamespacePrefix; - private String xsdNamespacePrefix; - - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - // Added for JUnit - public WSDLConverter(String name) - { - super(name); - } - - /** - * @param definition - */ - public WSDLConverter(Definition definition) - { - super(definition); - // TODO Auto-generated constructor stub - } - - public void generate20(String filename) throws Exception - { - createDocument(); - visit(); - serialize(filename); - } - - private void serialize(String filename) throws Exception - { - Source domSource = new DOMSource(doc); - Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT,"yes"); - transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4"); - transformer.transform(domSource,new StreamResult(new FileOutputStream(filename))); - } - - private void createDocument() throws ParserConfigurationException - { - doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - } - - private Element createWSDLElement(String name) - { - Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name); - if (wsdlNamespacePrefix != null) - element.setPrefix(wsdlNamespacePrefix); - - return element; - } - - private void processDocumentation(Element docElement, Element parent) - { - if (docElement == null) - return; - - Element adoptedDocElement = (Element)doc.importNode(docElement,true); - parent.appendChild(adoptedDocElement); - } - - protected void visitDefinition(Definition def) - { - description = createWSDLElement("description"); - processDocumentation(def.getDocumentationElement(),description); - - // TBD - Determine later if we want to convert the document to use SOAP 1.2. - // However adding these two namespaces may not be harmful. - description.setAttribute("xmlns:soapenv","http://www.w3.org/2003/05/soap-envelop"); - description.setAttribute("xmlns:wsoap","http://www.w3.org/2004/08/soap12"); - - String targetNamespace = def.getTargetNamespace(); - if (targetNamespace != null) - description.setAttribute("targetNamespace",targetNamespace); - - Iterator iterator = def.getNamespaces().keySet().iterator(); - String prefix = null; - String namespace = null; - /* - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"*/ - while (iterator.hasNext()) - { - prefix = (String)iterator.next(); - namespace = def.getNamespace(prefix); - - if ("http://schemas.xmlsoap.org/wsdl/".equals(namespace)) - { - if (prefix.length() == 0) // meant to be default namespace - description.setAttribute("xmlns","http://www.w3.org/2004/08/wsdl"); - else - { - description.setAttribute("xmlns:" + prefix,"http://www.w3.org/2004/08/wsdl"); - wsdlNamespacePrefix = prefix; - description.setPrefix(wsdlNamespacePrefix); - } - continue; - } - - // SOAP 1.2 - if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(namespace)) - { - // SOAP 1.2 - description.setAttribute("xmlns:" + prefix,"http://www.w3.org/2003/05/soap-envelop"); - - // WSDL 2.0 binding for SOAP 1.2 - description.setAttribute("xmlns:wsoap","http://www.w3.org/2004/08/soap12"); - continue; - } - - //if ("http://schemas.xmlsoap.org/soap/encoding/".equals(namespace)) - // continue; - - if ("http://www.w3.org/2001/XMLSchema".equals(namespace)) - xsdNamespacePrefix = prefix; // We will use this in visitImport(). - - if (prefix.length() == 0) // meant to be default namespace - description.setAttribute("xmlns" + prefix,namespace); - else - description.setAttribute("xmlns:" + prefix,namespace); - } - - doc.appendChild(description); - super.visitDefinition(def); - - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitImport(org.eclipse.wst.wsdl.Import) - */ - protected void visitImport(Import wsdlImport) - { - // Determine if we <import> a schema. - if (importingSchema(wsdlImport)) - { - currentTypes = createWSDLElement("types"); - description.appendChild(currentTypes); - - // <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/> - Element schemaImport = doc.createElementNS("http://www.w3.org/2001/XMLSchema","import"); - if (xsdNamespacePrefix == null) // need to add one - { - description.setAttribute("xmlns:xs","http://www.w3.org/2001/XMLSchema"); - xsdNamespacePrefix = "xs"; - schemaImport.setPrefix(xsdNamespacePrefix); - } - else if (!"".equals(xsdNamespacePrefix)) // it is not default namespace - schemaImport.setPrefix(xsdNamespacePrefix); - - schemaImport.setAttribute("namespace",wsdlImport.getNamespaceURI()); - schemaImport.setAttribute("schemaLocation",wsdlImport.getLocationURI()); - processDocumentation(wsdlImport.getDocumentationElement(),schemaImport); - currentTypes.appendChild(schemaImport); - } - else - { - Element importElement = wsdlImport.getElement(); - Element adoptedImportElement = (Element)doc.importNode(importElement,true); - processDocumentation(wsdlImport.getDocumentationElement(),adoptedImportElement); - description.appendChild(adoptedImportElement); - } - } - - private boolean importingSchema(Import myImport) - { - if (myImport.getDefinition() != null) // it is WSDL import - return false; - else - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitTypes(org.eclipse.wst.wsdl.Types) - */ - protected void visitTypes(Types types) - { - // currentTypes may have been created in visitImport(). - if (currentTypes == null) - { - currentTypes = createWSDLElement("types"); - processDocumentation(types.getDocumentationElement(),currentTypes); - description.appendChild(currentTypes); - } - - Iterator iterator = types.getSchemas().iterator(); - XSDSchema schema = null; - Element schemaElement = null; - Element adoptedSchemaElement = null; - while (iterator.hasNext()) - { - schema = (XSDSchema)iterator.next(); - schema.updateElement(); - schemaElement = schema.getElement(); - adoptedSchemaElement = (Element)doc.importNode(schemaElement,true); - currentTypes.appendChild(adoptedSchemaElement); - } - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPart(org.eclipse.wst.wsdl.Part) - */ - protected void visitPart(Part part) - { - // TODO Auto-generated method stub - } - - protected void visitPortType(PortType portType) - { - currentInterface = createWSDLElement("interface"); - processDocumentation(portType.getDocumentationElement(),currentInterface); - - Element portTypeElement = portType.getElement(); - if (portTypeElement.hasAttribute("name")) - currentInterface.setAttribute("name",portTypeElement.getAttribute("name")); - - description.appendChild(currentInterface); - super.visitPortType(portType); - } - - protected void visitOperation(Operation operation) - { - currentOperation = createWSDLElement("operation"); - processDocumentation(operation.getDocumentationElement(),currentOperation); - - Element operationElement = operation.getElement(); - if (operationElement.hasAttribute("name")) - currentOperation.setAttribute("name",operationElement.getAttribute("name")); - - OperationType opType = operation.getStyle(); - if (OperationType.REQUEST_RESPONSE == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/in-out"); - else if (OperationType.SOLICIT_RESPONSE == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/out-in"); - else if (OperationType.NOTIFICATION == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/out-only"); - else if (OperationType.ONE_WAY == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/in-only"); - - currentInterface.appendChild(currentOperation); - super.visitOperation(operation); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitInput(org.eclipse.wst.wsdl.Input) - */ - protected void visitInput(Input input) - { - Element currentInput = createWSDLElement("input"); - processDocumentation(input.getDocumentationElement(),currentInput); - - Element inputElement = input.getElement(); - - if (inputElement.hasAttribute("name")) - currentInput.setAttribute("messageLabel",inputElement.getAttribute("name")); - - Element partElement = getPartElement(input); - if (partElement.hasAttribute("element")) - currentInput.setAttribute("element",partElement.getAttribute("element")); - // TBD - what if the part uses "type"? - - currentOperation.appendChild(currentInput); - } - - private Element getPartElement(MessageReference messageRef) - { - Iterator iterator = messageRef.getEMessage().getEParts().iterator(); - // TBD - for now, take the first part. - Part part = (Part)iterator.next(); - Element partElement = part.getElement(); - return partElement; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitOutput(org.eclipse.wst.wsdl.Output) - */ - protected void visitOutput(Output output) - { - Element currentOutput = createWSDLElement("output"); - processDocumentation(output.getDocumentationElement(),currentOutput); - - Element outputElement = output.getElement(); - - if (outputElement.hasAttribute("name")) - currentOutput.setAttribute("messageLabel",outputElement.getAttribute("name")); - - Element partElement = getPartElement(output); - if (partElement.hasAttribute("element")) - currentOutput.setAttribute("element",partElement.getAttribute("element")); - // TBD - what if the part uses "type"? - - currentOperation.appendChild(currentOutput); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitFault(org.eclipse.wst.wsdl.Fault) - */ - protected void visitFault(Fault fault) - { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitBinding(org.eclipse.wst.wsdl.Binding) - */ - protected void visitBinding(Binding binding) - { - currentBinding = createWSDLElement("binding"); - processDocumentation(binding.getDocumentationElement(),currentBinding); - - Element bindingElement = binding.getElement(); - if (bindingElement.hasAttribute("name")) - currentBinding.setAttribute("name",bindingElement.getAttribute("name")); - if (bindingElement.hasAttribute("type")) - currentBinding.setAttribute("interface",bindingElement.getAttribute("type")); - - // TBD - is the next line fixed for SOAP? - currentBinding.setAttribute("type","http://www.w3.org/2004/08/wsdl/soap12"); - currentBinding.setAttribute("wsoap:protocol","http://www.w3.org/2003/05/soap/bindings/HTTP"); - currentBinding.setAttribute("wsoap:mepDefault","http://www.w3.org.2003/05/soap/mep/request-response"); - - description.appendChild(currentBinding); - super.visitBinding(binding); - } - - protected void visitBindingOperation(BindingOperation operation) - { - currentBindingOperation = createWSDLElement("operation"); - processDocumentation(operation.getDocumentationElement(),currentBindingOperation); - - Element operationElement = operation.getElement(); - String operationName = operation.getEOperation().getName(); - - // Determine prefix - String prefix = null; - String targetNamespace = null; - Definition def = operation.getEnclosingDefinition(); - if (def != null) - targetNamespace = def.getTargetNamespace(); - if (targetNamespace != null) - prefix = def.getPrefix(targetNamespace); - - if (prefix == null) - prefix = ""; - else - prefix += ":"; - - currentBindingOperation.setAttribute("ref",prefix + operationName); - - currentBinding.appendChild(currentBindingOperation); - super.visitBindingOperation(operation); - } - - protected void visitBindingInput(BindingInput input) - { - currentBindingInput = createWSDLElement("input"); - processDocumentation(input.getDocumentationElement(),currentBindingInput); - - Element inputElement = input.getElement(); - String inputName = input.getName(); - if (inputName != null) - inputElement.setAttribute("name",inputName); - - currentBindingOperation.appendChild(currentBindingInput); - super.visitBindingInput(input); - } - - protected void visitBindingOutput(BindingOutput output) - { - currentBindingOutput = createWSDLElement("output"); - processDocumentation(output.getDocumentationElement(),currentBindingOutput); - - Element outputElement = output.getElement(); - String outputName = output.getName(); - if (outputName != null) - outputElement.setAttribute("name",outputName); - - currentBindingOperation.appendChild(currentBindingOutput); - super.visitBindingOutput(output); - } - - protected void visitBindingFault(BindingFault fault) - { - currentBindingFault = createWSDLElement("fault"); - processDocumentation(fault.getDocumentationElement(),currentBindingFault); - - Element faultElement = fault.getElement(); - String faultName = fault.getName(); - if (faultName != null) - faultElement.setAttribute("name",faultName); - - currentBindingOperation.appendChild(currentBindingFault); - super.visitBindingFault(fault); - } - - protected void visitService(Service service) - { - currentService = createWSDLElement("service"); - processDocumentation(service.getDocumentationElement(),currentService); - - Element serviceElement = service.getElement(); - if (serviceElement.hasAttribute("name")) - currentService.setAttribute("name",serviceElement.getAttribute("name")); - - description.appendChild(currentService); - super.visitService(service); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPort(org.eclipse.wst.wsdl.Port) - */ - protected void visitPort(Port port) - { - currentEndpoint = createWSDLElement("endpoint"); - processDocumentation(port.getDocumentationElement(),currentEndpoint); - - Element portElement = port.getElement(); - if (portElement.hasAttribute("name")) - currentEndpoint.setAttribute("name",portElement.getAttribute("name")); - if (portElement.hasAttribute("binding")) - currentEndpoint.setAttribute("binding",portElement.getAttribute("binding")); - - // Add interface to current service - Binding binding = port.getEBinding(); - if (binding != null) // binding could not be resolved - { - Element bindingElement = binding.getElement(); - if (bindingElement.hasAttribute("type")) - currentService.setAttribute("interface",bindingElement.getAttribute("type")); - } - - currentService.appendChild(currentEndpoint); - super.visitPort(port); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitExtensibilityElement(org.eclipse.wst.wsdl.ExtensibleElement, org.eclipse.wst.wsdl.ExtensibilityElement) - */ - protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement) - { - // TBD - It is not just SOAP binding - if (owner instanceof org.eclipse.wst.wsdl.internal.impl.PortImpl) - { - Element soapElement = extensibilityElement.getElement(); - if (soapElement.hasAttribute("location")) - currentEndpoint.setAttribute("address",soapElement.getAttribute("location")); - } - else - { - Element domElement = extensibilityElement.getElement(); - Element adoptedDOMElement = (Element)doc.importNode(domElement,true); - - if (owner instanceof org.eclipse.wst.wsdl.internal.impl.DefinitionImpl) - description.insertBefore(adoptedDOMElement,description.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.ServiceImpl) - currentService.insertBefore(adoptedDOMElement,currentService.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.PortTypeImpl) - currentInterface.insertBefore(adoptedDOMElement,currentInterface.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.OperationImpl) - currentOperation.insertBefore(adoptedDOMElement,currentOperation.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingImpl) - currentBinding.insertBefore(adoptedDOMElement,currentBinding.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl) - currentBindingOperation.insertBefore(adoptedDOMElement,currentBindingOperation.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingInputImpl) - currentBindingInput.insertBefore(adoptedDOMElement,currentBindingInput.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingOutputImpl) - currentBindingOutput.insertBefore(adoptedDOMElement,currentBindingOutput.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingFaultImpl) - currentBindingFault.insertBefore(adoptedDOMElement,currentBindingFault.getFirstChild()); - - } - - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new WSDLConverter("Convert") - { - protected void runTest() - { - testConvert(); - } - } - ); - return suite; - } - - public void testConvert() - { - try - { - Definition def = DefinitionLoader.load("d:/eclipse301/eclipse/workspace/org.eclipse.wst.wsdl.tests/PTATimeDistribution.wsdl"); - WSDLConverter converter = new WSDLConverter(def); - converter.generate20("d:/eclipse301/eclipse/workspace/org.eclipse.wst.wsdl.tests/PTATimeDistribution20.wsdl"); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public static void main(String[] args) - { - junit.textui.TestRunner.run(suite()); - /* - try - { - Definition def = DefinitionLoader.load(args[0]); - WSDLConverter converter = new WSDLConverter(def); - converter.generate20("test20.wsdl"); - } - catch (Exception e) - { - e.printStackTrace(); - }*/ - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java deleted file mode 100644 index a4c5b3bc8..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.emf.common.notify.impl.AdapterImpl; -import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; -import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator; - -public class WSDLModelLocatorAdapterFactory extends AdapterFactoryImpl -{ - protected CustomWSDLModelLocator customWSDLModelLocator = new CustomWSDLModelLocator(); - - class CustomWSDLModelLocator extends AdapterImpl implements WSDLModelLocator - { - public String resolveURI(String baseLocation, String namespace, String location) - { - return URIResolverPlugin.createResolver().resolve(baseLocation, namespace, location); - } - - public boolean isAdatperForType(Object type) - { - return type == WSDLModelLocator.class; - } - } - - public boolean isFactoryForType(Object type) - { - return type == WSDLModelLocator.class; - } - - public Adapter adaptNew(Notifier target, Object type) - { - return customWSDLModelLocator; - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java deleted file mode 100644 index 907a3306e..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java +++ /dev/null @@ -1,169 +0,0 @@ -package org.eclipse.wst.wsdl.tests.util; - -import org.w3c.dom.*; -import org.xml.sax.SAXException; - -import java.io.*; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -/** - * @author Kihup Boo - */ -public class XMLDiff -{ - private PrintStream out = System.out; - private boolean DIFF_ELEMENT_NODE_ONLY = false; - - public boolean diff(String file1, String file2) throws ParserConfigurationException, SAXException, IOException - { - return diff(file1,file2,false); - } - - public boolean diff(String file1, String file2, boolean elementOnly) throws ParserConfigurationException, SAXException, IOException - { - Document doc1 = getDocument(file1); - Document doc2 = getDocument(file2); - DIFF_ELEMENT_NODE_ONLY = elementOnly; - return diff(doc1,doc2); - } - - public boolean diff(Document doc1, Document doc2) - { - Element root1 = doc1.getDocumentElement(); - Element root2 = doc2.getDocumentElement(); - return compareNodes(root1,root2); - } - - private Document getDocument(String uri) throws ParserConfigurationException, SAXException, IOException - { - DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document doc = builder.parse(uri); - return doc; - } - - private boolean compareNodes(Node node1, Node node2) - { - if (DIFF_ELEMENT_NODE_ONLY) - { - // Compare only element nodes in the children. - filterNonElementNodes(node1); - filterNonElementNodes(node2); - } - - if (node1.getNodeType() != node2.getNodeType() - || node1.getNodeName() != node2.getNodeName()) - { - println("Node type or node name is different:"); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - - if (!compareAttributes(node1,node2)) - return false; - - NodeList nodeList1 = node1.getChildNodes(); - NodeList nodeList2 = node2.getChildNodes(); - if (nodeList1.getLength() != nodeList2.getLength()) - { - println("The number of children is different:"); - //println("Node 1: " + nodeList1.getLength()); - //println("Node 2: " + nodeList2.getLength()); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - - boolean result = true; - int length = nodeList1.getLength(); - for (int i=0; i<length; i++) - { - result = compareNodes(nodeList1.item(i),nodeList2.item(i)); - if (!result) - return false; - } - return true; - } - - private void filterNonElementNodes(Node node) - { - Node firstChild = node.getFirstChild(); - while (firstChild.getNodeType() != Node.ELEMENT_NODE) - { - node.removeChild(firstChild); - firstChild = node.getFirstChild(); - } - - Node sibling = firstChild.getNextSibling(); - Node deleteMe = null; - while (sibling != null) - { - if (sibling.getNodeType() != Node.ELEMENT_NODE) - { - deleteMe = sibling; - sibling = sibling.getNextSibling(); - node.removeChild(deleteMe); - } - - } - } - - private boolean compareAttributes(Node node1, Node node2) - { - NamedNodeMap nodeMap1 = node1.getAttributes(); - NamedNodeMap nodeMap2 = node2.getAttributes(); - - if (nodeMap1 == null || nodeMap2 == null) - { - if (nodeMap1 == null && nodeMap2 == null) - return true; - else - return false; - } - - if (nodeMap1.getLength() != nodeMap2.getLength()) - { - println("The number of attributes is different:"); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - - Node attrNode1 = null; - Node attrNode2 = null; - int length = nodeMap1.getLength(); - for (int i=0; i<length; i++) - { - attrNode1 = nodeMap1.item(i); - attrNode2 = nodeMap2.getNamedItem(attrNode1.getNodeName()); - if (attrNode2 == null) - { - println("The attribute is not found in Node 2: " + attrNode1.getNodeName()); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - else if (!attrNode1.getNodeValue().equals(attrNode2.getNodeValue())) - { - println("The attribute values are different:"); - println("Node 1: " + node1.getNodeName() + "," + attrNode1.getNodeValue()); - println("Node 2: " + node2.getNodeName() + "," + attrNode2.getNodeValue()); - return false; - } - } - return true; - } - - private void print(String s) - { - out.print(s); - } - - private void println(String s) - { - out.println(s); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java deleted file mode 100644 index 5bbba8750..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.xsd.util.XSDSchemaLocationResolver; - -public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl -{ - protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl(); - - public boolean isFactoryForType(Object type) - { - return type == XSDSchemaLocationResolver.class; - } - - public Adapter adaptNew(Notifier target, Object type) - { - return schemaLocator; - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java deleted file mode 100644 index 7a4387a09..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.tests.util; - -import org.eclipse.emf.common.notify.impl.AdapterImpl; -import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDSchemaLocationResolver; -import org.eclipse.xsd.util.XSDSchemaLocator; - -public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver -{ - public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI) - { - String baseLocation = xsdSchema.getSchemaLocation(); - return URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI); - } - - public boolean isAdatperForType(Object type) - { - return type == XSDSchemaLocator.class; - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/test.xml b/tests/org.eclipse.wst.wsdl.tests/test.xml deleted file mode 100644 index fca583e75..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/test.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.." /> --> - - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.wsdl.tests" /> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.tests.*xml" /> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="wst-folder" value="${eclipse-home}/wst_folder"/> - <delete dir="${wst-folder}" quiet="true"/> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${wst-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.AllTestCases" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.wst.wsdl.tests.*xml" /> - <property name="output-file" value="${plugin-name}.xml" /> - </ant> - </target> - -</project>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.classpath b/tests/org.eclipse.wst.wsdl.validation.tests/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore b/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore deleted file mode 100644 index 1172c7fb2..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -wsdlvalidatetests.jar diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.project b/tests/org.eclipse.wst.wsdl.validation.tests/.project deleted file mode 100644 index f2a6db4e8..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.wsdl.validation.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 38bc84d48..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: WSDL Validator Tests Plug-in -Bundle-SymbolicName: org.eclipse.wst.wsdl.validation.tests -Bundle-Version: 1.0.0 -Bundle-ClassPath: wsdlvalidatetests.jar -Bundle-Activator: org.eclipse.wst.wsdl.validation.tests.internal.WSDLValidatorTestsPlugin -Bundle-Vendor: Eclipse -Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.junit, - org.eclipse.core.resources, - org.eclipse.wst.wsdl.validation, - org.eclipse.wst.ws, - org.eclipse.wst.command.env.core, - org.eclipse.wst.command.env, - org.apache.ant, - org.wsdl4j -Eclipse-AutoStart: true diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/about.html b/tests/org.eclipse.wst.wsdl.validation.tests/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/build.properties b/tests/org.eclipse.wst.wsdl.validation.tests/build.properties deleted file mode 100644 index 4efc76855..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -source.wsdlvalidatetests.jar = src/ -output.wsdlvalidatetests.jar = bin/ -bin.includes = plugin.xml,\ - wsdlvalidatetests.jar,\ - testresources/,\ - test.xml,\ - runtests.bat,\ - META-INF/,\ - META-INF/,\ - about.html diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java deleted file mode 100644 index 31dcb9325..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/resolver/URIResolverTest.java +++ /dev/null @@ -1,203 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.internal.resolver; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * URIResolver tests. - */ -public class URIResolverTest extends TestCase -{ - private URIResolver uriResolver = null; - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(URIResolverTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - uriResolver = new URIResolver(); - } - - public void testNormalizeAbsoluteFile() - { - // System id is absolute and should not be modified. - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "file:/c:/somepath/myfile.txt"; - assertEquals("systemId is absolute and should not be modified.", systemId, uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - - } - - public void testNormalizeRelativeFile() - { - // System id is relative - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("systemId is simple relative and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileStartsWithDotDot() - { - // System id is relative with ../ - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "../myfile.txt"; - assertEquals("systemId is relative with ../ and is not modified correctly.", "file:/c:/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileStartsWithDotDotTwice() - { - // System id is relative with ../../ - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "../../myfile.txt"; - assertEquals("systemId is relative with ../../ and is not modified correctly.", "file:/c:/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileStartsWithDot() - { - // System id is relative with ./ - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "./myfile.txt"; - assertEquals("systemId is relative with ./ and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileStartsWithDotTwice() - { - // System id is relative with ././ - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "././myfile.txt"; - assertEquals("systemId is relative with ././ and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileStartsWithSlash() - { - // System id is relative beginning with / - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "/myfile.txt"; - assertEquals("systemId is relative beginning with / and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileDotDotInMiddle() - { - // System id contains ../ in the middle - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "somepath/../myfile.txt"; - assertEquals("systemId is relative and contains ../ in the middle and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileFotInMiddle() - { - // System id contains ./ in the middle - String baseLocation = "file:/c:/somepath/somepath/file.txt"; - String systemId = "somepath/./myfile.txt"; - assertEquals("systemId is relative and contains ./ in the middle and is not modified correctly.", "file:/c:/somepath/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormlizeRelativeFileDotDotInMiddleOfBase() - { - // Base location contains ../ in the middle - String baseLocation = "file:/c:/somepath/../somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("baseLocation contains ../ in the middle and is not modified correctly.", "file:/c:/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileDotInMiddleOfBase() - { - // Base location contains ./ in the middle - String baseLocation = "file:/c:/somepath/./somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("baseLocation contains ./ in the middle and is not modified correctly.", "file:/c:/somepath/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileBaseStartsWithSlashDotDot() - { - // Base location starts with /../ - String baseLocation = "file:/../somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("baseLocation starts with ../ and is not modified correctly.", "file:/../somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileBaseStartsWithSlashDot() - { - // Base location starts with /./ - String baseLocation = "file:/./somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("baseLocation starts with ./ and is not modified correctly.", "file:/somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileBaseStartsWithDotDot() - { - // Base location starts with ../ - String baseLocation = "file:../somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("baseLocation starts with ../ and is not modified correctly.", "file:../somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileBaseStartsWithDot() - { - // Base location starts with ./ - String baseLocation = "file:./somepath/file.txt"; - String systemId = "myfile.txt"; - assertEquals("baseLocation starts with ./ and is not modified correctly.", "file:somepath/myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileSomedirDotDot() - { - // System id contains somedir../ in the middle - String baseLocation = "file:/somepath/file.txt"; - String systemId = "somedir../myfile.txt"; - assertEquals("systemId has somedir../ and is not modified correctly.", "file:/somepath/somedir../myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeRelativeFileSomedirDot() - { - // System id contains somedir./ in the middle - String baseLocation = "file:/somepath/file.txt"; - String systemId = "somedir./myfile.txt"; - assertEquals("systemId has somedir./ and is not modified correctly.", "file:/somepath/somedir./myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeNullSystemId() - { - // System id is null - String baseLocation = "file:/somepath/file.txt"; - String systemId = null; - assertEquals("systemId is null.", null, uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeNullBaseLocation() - { - // Base location is null - String baseLocation = null; - String systemId = "somedir./myfile.txt"; - assertEquals("systemId is null.", null, uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - public void testNormalizeSystemIdAbsoluteNullBaseLocation() - { - // Base location is null - String baseLocation = "null"; - String systemId = "file:/somedir./myfile.txt"; - assertEquals("systemId is null.", "file:/somedir./myfile.txt", uriResolver.resolve(baseLocation, null, systemId).getLogicalLocation()); - } - - -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java deleted file mode 100644 index 907875d96..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTask.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.internal.ui.ant; - -import java.util.List; - -/** - * This class is used to expose functionality from the WSDLValidate class for testing. - */ -public class WSDLValidateTask extends WSDLValidate -{ - - /** - * @see org.eclipse.wst.wsdl.validation.internal.ui.ant.WSDLValidate#getFileList() - */ - public List getFileList() - { - return super.getFileList(); - } - -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java deleted file mode 100644 index 92ca201f3..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/WSDLValidateTest.java +++ /dev/null @@ -1,143 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.internal.ui.ant; - -import java.io.File; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.selectors.FilenameSelector; -import org.eclipse.wst.wsdl.validation.tests.internal.BaseTestCase; - -/** - * WSDLValidate ant task tests. - */ -public class WSDLValidateTest extends BaseTestCase -{ - private String BASE_DIR;; - private Project project; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(WSDLValidateTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() - { - super.setUp(); - try - { - BASE_DIR = PLUGIN_ABSOLUTE_PATH; - BASE_DIR = BASE_DIR.replace('/', File.separatorChar); - if(BASE_DIR.startsWith("\\")) - { - BASE_DIR = BASE_DIR.substring(1); - } - } - catch(Exception e) - { - - } - project = new Project(); - project.setBaseDir(new File(BASE_DIR)); - } - - /** - * Test that a single file with a relative location is resolved properly. - */ - public void testRelativeSingleFileLocation() - { - String fileLoc = "file.wsdl"; - String resolvedLocation = ("file:///" + BASE_DIR + fileLoc).replace('\\','/'); - WSDLValidateTask wsdlValidateTask = new WSDLValidateTask(); - wsdlValidateTask.setProject(project); - wsdlValidateTask.setFile(fileLoc); - List fileList = wsdlValidateTask.getFileList(); - assertEquals("The file list does not contain only one file.", 1, fileList.size()); - // The file locations are converted to lower case to avoid drive letter case differences on windows. ie. C vs c. - assertEquals("The file location '" + fileList.get(0) + "' is not correctly resolved to the base location.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase()); - - } - - /** - * Test that a single file with an absolute location is resolved properly. - */ - public void testAbsoluteSingleFileLocation() - { - String fileLoc = BASE_DIR + "file.wsdl"; - String resolvedLocation = (FILE_PROTOCOL + fileLoc).replace('\\','/'); - WSDLValidateTask wsdlValidateTask = new WSDLValidateTask(); - wsdlValidateTask.setProject(project); - wsdlValidateTask.setFile(fileLoc); - List fileList = wsdlValidateTask.getFileList(); - assertEquals("The file list does not contain only one file.", 1, fileList.size()); - assertEquals("The file location '" + fileLoc + "' is modified.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase()); - - } - - /** - * Test that a single file with an absolute, remote location is resolved properly. - */ - public void testAbsoluteSingleFileRemoteLocation() - { - String resolvedLocation = "http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl"; - String fileLoc = "http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl"; - WSDLValidateTask wsdlValidateTask = new WSDLValidateTask(); - wsdlValidateTask.setProject(project); - wsdlValidateTask.setFile(fileLoc); - List fileList = wsdlValidateTask.getFileList(); - assertEquals("The file list does not contain only one file.", 1, fileList.size()); - assertEquals("The file location '" + fileLoc + "' is modified.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase()); - - } - -/** - * Test that a single file in a fileset with a relative location is resolved properly - * when no directory is specified. - */ - public void testRelativeSingleFileInFilesetNoDirSpecified() - { - String fileLoc = "Empty.wsdl"; - String base_dir = BASE_DIR + SAMPLES_DIR + "WSDL" + File.separator + "SelfContained"; - String resolvedLocation = ("file:///" + base_dir + "/" + fileLoc).replace('\\','/'); - base_dir = base_dir.replace('/', File.separatorChar); - - WSDLValidateTask wsdlValidateTask = new WSDLValidateTask(); - wsdlValidateTask.setProject(project); - - FileSet fileset = wsdlValidateTask.createFileset(); - fileset.setProject(project); - fileset.setDir(new File(base_dir)); - - FilenameSelector filenameSelector = new FilenameSelector(); - filenameSelector.setName(fileLoc); - fileset.addFilename(filenameSelector); - //fileset.setFile(new File(fileLoc)); - - List fileList = wsdlValidateTask.getFileList(); - assertEquals("The file list does not contain only one file.", 1, fileList.size()); - // The file locations are converted to lower case to avoid drive letter case differences on windows. ie. C vs c. - assertEquals("The file location '" + fileList.get(0) + "' is not correctly resolved to the base location.", resolvedLocation.toLowerCase(), ((String)fileList.get(0)).toLowerCase()); - - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorTest.java deleted file mode 100644 index acacb168a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorTest.java +++ /dev/null @@ -1,222 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd; - -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.apache.xerces.dom.DocumentImpl; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import com.ibm.wsdl.Constants; - -/** - * Tests for org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator. - * - */ -public class InlineSchemaGeneratorTest extends TestCase -{ - private InlineSchemaGeneratorWrapper generator; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(InlineSchemaGeneratorTest.class); - } - - /** - * JUnit setup method. - */ - public void setUp() - { - generator = new InlineSchemaGeneratorWrapper(); - } - - /** - * Test that checkSOAPEncodingRequired method. - */ - public void testCheckSOAPEncodingRequired() - { - // Test empty list. - assertFalse("The method does not return false when given an empty list.", generator.checkSOAPEncodingRequired(new ArrayList())); - - // Test that checkSOAPEncodingRequired returns false - // when given a list without the SOAP encoding namespace. - List list = new ArrayList(); - list.add("http://notsoapencodingnamespace"); - assertFalse("The method does not return false when given a list without the SOAP envelope namespace.", generator.checkSOAPEncodingRequired(list)); - - // Test that checkSOAPEncodingRequired returns true - // when given a list with the SOAP encoding namespace. - List list2 = new ArrayList(); - list2.add(InlineSchemaGeneratorWrapper.SOAP_ENCODING_URI); - assertTrue("The method does not return true when given a list with the SOAP encoding namespace.", generator.checkSOAPEncodingRequired(list2)); - } - - /** - * TODO: Implement tests for the CreateXSDStringRecursively method. - */ - public void todoCreateXSDStringRecursively() - { - } - - /** - * TODO: Implement tests for the GetImportNamespace method. - */ - public void todoGetImportNamespaces() - { - } - - /** - * Test that this method returns the correct namespace - * resolver. - */ - public void testGetNSResolver() - { - Document doc = new DocumentImpl(); - Element rootElem = doc.createElementNS(Constants.NS_URI_XSD_2001, "schema"); - - // Check that the resolver is empty. - Hashtable resolver = generator.getNSResolver(rootElem); - assertTrue("The resolver is not empty.", resolver.isEmpty()); - - // Check the resolver contains one value. - rootElem.setAttribute("xmlns", Constants.NS_URI_XSD_2001); - resolver = generator.getNSResolver(rootElem); - assertTrue("The resolver does not contain the empty namespace.", resolver.containsKey("")); - assertEquals("The resolver does not contain the correct value for the empty namespace.", Constants.NS_URI_XSD_2001, resolver.get("")); - - // Check the resolver contains two values. - rootElem.setAttribute("xmlns:other", "http://othernamespace"); - resolver = generator.getNSResolver(rootElem); - assertTrue("The resolver does not contain the other namespace.", resolver.containsKey("other")); - assertEquals("The resolver does not contain the correct value for the other namespace.", "http://othernamespace", resolver.get("other")); - - // Check the resolver still contains the empty namespace. - assertTrue("The resolver does not contain the empty namespace after adding a second namespace.", resolver.containsKey("")); - assertEquals("The resolver does not contain the correct value for the empty namespace after adding a second namespace.", Constants.NS_URI_XSD_2001, resolver.get("")); - - // Check the resolver doesn't contain non-xmlns attribute value. - rootElem.setAttribute("type:other2", "other2:type"); - resolver = generator.getNSResolver(rootElem); - assertFalse("The resolver contains the other2 namespace.", resolver.containsKey("other2")); - } - - /** - * Test that this method returns the required prefixes. - */ - public void testGetPrefixes() - { - // Check document that contains no required namespaces and no prefix. - Document doc = new DocumentImpl(); - Element rootElem = doc.createElementNS(Constants.NS_URI_XSD_2001, "schema"); - rootElem.setAttribute("xmlns",Constants.NS_URI_XSD_2001); - //doc.appendChild(rootElem); - - List reqNSs = generator.getNamespacePrefixes(rootElem); - assertEquals("The required namespace list does not contain one empty string.", 1, reqNSs.size()); - assertEquals("The required namespace list does not contain one empty string.", "", reqNSs.get(0)); - - // Check document that contains no required namespaces and the xsd prefix. - Element rootElem2 = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:schema"); - rootElem2.setAttribute("xmlns:xsd",Constants.NS_URI_XSD_2001); - List reqNSs2 = generator.getNamespacePrefixes(rootElem2); - assertEquals("The required namespace list does not contain the one string 'xsd'.", 1, reqNSs2.size()); - assertEquals("The required namespace list does not contain the one string 'xsd'.", "xsd", reqNSs2.get(0)); - - // Check document that contains an element with a required namespace. - Element rootElem4 = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:schema"); - rootElem2.setAttribute("xmlns:xsd",Constants.NS_URI_XSD_2001); - Element diffNSElem = doc.createElementNS("http://othernamespace", "other:element"); - rootElem4.appendChild(diffNSElem); - List reqNSs4 = generator.getNamespacePrefixes(rootElem4); - assertTrue("The required namespace list does not contain the prefix 'other' when the namespace is specified for an element.", reqNSs4.contains("other")); - - // Check document that contains a type with a required namespace. - Element rootElem5 = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:schema"); - rootElem5.setAttribute("xmlns:xsd",Constants.NS_URI_XSD_2001); - Element otherElem = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:element"); - otherElem.setAttribute("type", "other:type"); - rootElem5.appendChild(otherElem); - List reqNSs5 = generator.getNamespacePrefixes(rootElem5); - assertTrue("The required namespace list does not contain 'other' when the namespace is specified for a type.", reqNSs5.contains("other")); - - // Check document that contains an import. Import elements should be ignored. - // This is a contrived example as it contains a type attribute for the import element. - Element rootElem6 = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:schema"); - rootElem6.setAttribute("xmlns:xsd",Constants.NS_URI_XSD_2001); - Element importElem = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:import"); - importElem.setAttribute("type", "other:type"); - rootElem6.appendChild(importElem); - List reqNSs6 = generator.getNamespacePrefixes(rootElem6); - assertEquals("The required namespace list does not contain the one string 'xsd' when an import element is used.", 1, reqNSs6.size()); - assertEquals("The required namespace list does not contain the one string 'xsd' when an import element is used.", "xsd", reqNSs6.get(0)); - - // Check document that contains an include. Include elements should be ignored. - // This is a contrived example as it contains a type attribute for the include element. - Element rootElem7 = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:schema"); - rootElem7.setAttribute("xmlns:xsd",Constants.NS_URI_XSD_2001); - Element includeElem = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:include"); - includeElem.setAttribute("type", "other:type"); - rootElem7.appendChild(includeElem); - List reqNSs7 = generator.getNamespacePrefixes(rootElem6); - assertEquals("The required namespace list does not contain the one string 'xsd' when an import element is used.", 1, reqNSs7.size()); - assertEquals("The required namespace list does not contain the one string 'xsd' when an import element is used.", "xsd", reqNSs7.get(0)); - - // Check document that contains attribute with a required namespace. - Element rootElem3 = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:schema"); - rootElem3.setAttribute("xmlns:xsd",Constants.NS_URI_XSD_2001); - Element wsdlAttElem = doc.createElementNS(Constants.NS_URI_XSD_2001, "xsd:element"); - wsdlAttElem.setAttributeNS(Constants.NS_URI_WSDL, "wsdl:arrayType", "sometype[]"); - rootElem3.appendChild(wsdlAttElem); - List reqNSs3 = generator.getNamespacePrefixes(rootElem3); - assertTrue("The required namespace list does not contain 'wsdl' when the namespace is specified for an attribute.", reqNSs3.contains("wsdl")); - - } - - /** - * TODO: Implement tests for the RemoveImports method. - */ - public void todoRemoveImports() - { - } - - /** - * TODO: Implement tests for the RemoveLocalNamespace method. - */ - public void todoRemoveLocalNamespaces() - { - } - - /** - * TODO: Implement tests for the ResolveNamespace method. - */ - public void todoResolveNamespaces() - { - } - - /** - * - */ - public void testRestrictImports() - { - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorWrapper.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorWrapper.java deleted file mode 100644 index 53799b8eb..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/wsdl11/xsd/InlineSchemaGeneratorWrapper.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd; - -import java.util.Hashtable; -import java.util.List; -import java.util.Set; - -import org.w3c.dom.Element; - -/** - * Wrapper for InlineSchemaGenerator to allow testing protected methods. - */ -public class InlineSchemaGeneratorWrapper extends InlineSchemaGenerator -{ - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#checkSOAPEncodingRequired(java.util.List) - */ - protected boolean checkSOAPEncodingRequired(List reqns) - { - return super.checkSOAPEncodingRequired(reqns); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#createXSDStringRecursively(org.w3c.dom.Element, java.util.List, java.util.List, java.util.Hashtable, java.lang.String) - */ - protected String createXSDStringRecursively(Element elem, List elements, List requiredNamespaces, Hashtable reqNSDecl, String filelocation) - { - return super.createXSDStringRecursively(elem, elements, requiredNamespaces, - reqNSDecl, filelocation); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#getImportNamespaces(org.w3c.dom.Element) - */ - protected List getImportNamespaces(Element elem) - { - return super.getImportNamespaces(elem); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#getNSResolver(org.w3c.dom.Element) - */ - protected Hashtable getNSResolver(Element elem) - { - return super.getNSResolver(elem); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#getNamespacePrefixes(org.w3c.dom.Element) - */ - protected List getNamespacePrefixes(Element elem) - { - return super.getNamespacePrefixes(elem); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#removeImports(java.util.List, java.util.List) - */ - protected List removeImports(List namespaces, List importedNamespaces) - { - return super.removeImports(namespaces, importedNamespaces); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#removeLocalNamespaces(java.util.List, org.w3c.dom.Element) - */ - protected List removeLocalNamespaces(List namespaces, Element elem) - { - return super.removeLocalNamespaces(namespaces, elem); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#resolveNamespaces(java.util.List, java.util.Hashtable, java.util.Hashtable) - */ - protected Hashtable resolveNamespaces(List namespaces, Hashtable nsResolver, Hashtable parentNSResolver) - { - return super.resolveNamespaces(namespaces, nsResolver, parentNSResolver); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGenerator#restrictImports(java.util.List, java.util.Set) - */ - protected List restrictImports(List namespaces, Set validImportNSs) - { - return super.restrictImports(namespaces, validImportNSs); - } - -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java deleted file mode 100644 index 941135e77..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/xml/XMLCatalogTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.eclipse.wst.wsdl.validation.internal.xml; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.wst.wsdl.validation.tests.internal.BaseTestCase; - -/** - * Tests for the WSDL validator's internal XML catalog. - */ -public class XMLCatalogTest extends BaseTestCase -{ - private String CATALOG_DIR = "testresources/samples/XSD/CatalogSchemas/"; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(XMLCatalogTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() - { - super.setUp(); - XMLCatalog.reset(); - } - - - -public void testSchemaDir() - { - XMLCatalog.addSchemaDir(PLUGIN_ABSOLUTE_PATH + CATALOG_DIR); - String catalogLocation = PLUGIN_ABSOLUTE_PATH + CATALOG_DIR; - catalogLocation = catalogLocation.replace('\\','/'); - while(catalogLocation.startsWith("/")) - { - catalogLocation = catalogLocation.substring(1); - } - catalogLocation = FILE_PROTOCOL + catalogLocation; - IXMLCatalog catalog = XMLCatalog.getInstance(); - String resolvedLocation = catalog.resolveEntityLocation("http://www.example.org/schema1", ""); - assertEquals("The resolved location is not equal to the expected location.", catalogLocation + "schema1.xsd", resolvedLocation); - resolvedLocation = catalog.resolveEntityLocation("http://www.example.org/schema2", ""); - assertEquals("The second resolved location is not equal to the resolved location.", catalogLocation + "schema2.xsd", resolvedLocation); - - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java deleted file mode 100644 index 36739c4e6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.tests.internal; -import junit.framework.Test; - -import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverTest; -import org.eclipse.wst.wsdl.validation.internal.ui.ant.WSDLValidateTest; -import org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd.InlineSchemaGeneratorTest; -import org.eclipse.wst.wsdl.validation.internal.xml.XMLCatalogTest; -/** - * The root test suite that contains all other WSDL validator test suites. - */ -public class AllWSDLTests extends junit.framework.TestSuite -{ - /** - * Create this test suite. - * - * @return This test suite. - */ - public static Test suite() - { - return new AllWSDLTests(); - } - - /** - * Constructor - */ - public AllWSDLTests() - { - super("AllWSDLTests"); - addTest(XSDTest.suite()); - addTest(WSDLTest.suite()); - addTest(PathsTest.suite()); - addTest(URIResolverTest.suite()); - addTest(WSDLValidateTest.suite()); - addTest(XMLCatalogTest.suite()); - addTest(InlineSchemaGeneratorTest.suite()); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java deleted file mode 100644 index c13f446c8..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java +++ /dev/null @@ -1,257 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.tests.internal; - -import java.io.BufferedReader; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.Reader; -import java.util.Iterator; -import java.util.List; - -import junit.framework.TestCase; - -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLValidator; - -/** - * Base test case class which provides methods to - * - create logs - * - read from logs - * - run log comparison tests - */ -public class BaseTestCase extends TestCase -{ - protected String FILE_PROTOCOL = "file:///"; - protected String PLUGIN_ABSOLUTE_PATH; - protected String SAMPLES_DIR = "testresources/samples/"; - protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/"; - protected String IDEAL_RESULTS_DIR = "testresources/idealResults/"; - protected String LOG_FILE_LOCATION = "results.log"; - - protected static final String PLUGIN_NAME = "org.eclipse.wst.wsdl.validation.tests"; - private WSDLValidator validator = WSDLValidator.getInstance(); - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() - { - PLUGIN_ABSOLUTE_PATH = WSDLValidatorTestsPlugin.getInstallURL();//getPluginLocation(); - - // Set the WS-I preference to ignore so only WSDL errors will be tested. - WSPlugin wsui = WSPlugin.getInstance(); - PersistentWSIContext wsicontext = wsui.getWSISSBPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - wsicontext = wsui.getWSIAPContext(); - wsicontext.updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI); - } - - /** - * Run a validator test. The test will run the validator, log the results and compare the results - * with the ideal results. The test will only pass if the two log files are the same. - * - * @param testfile The file to run the validator test on. - * @param loglocation The location to create the log file. - * @param idealloglocation The location of the ideal log file. - */ - public void runTest(String testfile, String loglocation, String idealloglocation) - { - IValidationReport valreport = validator.validate(testfile); - try - { - createLog(loglocation, valreport); - String generatedLog = getStringFromFile(loglocation); - String idealLog = getStringFromFile(idealloglocation); - assertEquals(idealLog, generatedLog); - } catch (Exception e) - { - fail("Could not compare log files"); - } - } - - /** - * Get a string representation of a file. - * - * @param filename the file name of the file to get the string representation. - * @return The string representation if successful. - * @throws Exception Thrown if unable to create a string representaion of the file. - */ - private String getStringFromFile(String filename) throws Exception - { - if(filename.startsWith("file:")) - { - filename = filename.substring(6); - while(filename.startsWith("\\") || filename.startsWith("/")) - { - filename = filename.substring(1); - } - } - StringBuffer filestring = new StringBuffer(); - Reader reader = null; - BufferedReader bufreader = null; - try - { - File file = new File(filename); - reader = new FileReader(file); - bufreader = new BufferedReader(reader); - while (bufreader.ready()) - { - filestring.append(bufreader.readLine() + "\n"); - } - } catch (FileNotFoundException e) - { - throw new Exception(); - } finally - { - bufreader.close(); - reader.close(); - } - return filestring.toString(); - } - - /** - * Create a log file for an XSD test. - * - * @param filename The name of the log file to create. - * @param valreport The validation report for this file. - * @return The file contents as a string if successful or null if not successful. - */ - private String createLog(String filename, IValidationReport valreport) - { - if(filename.startsWith("file:")) - { - filename = filename.substring(6); - while(filename.startsWith("\\") || filename.startsWith("/")) - { - filename = filename.substring(1); - } - } - IValidationMessage[] valmessages = valreport.getValidationMessages(); - int nummessages = valmessages.length;//validator.getErrors().size() + validator.getWarnings().size(); - StringBuffer errorsString = new StringBuffer(); - StringBuffer warningsString = new StringBuffer(); - int numerrors = 0; - int numwarnings = 0; - for(int i = 0; i < nummessages; i++) - { - IValidationMessage valmes = valmessages[i]; - if(valmes.getSeverity() == IValidationMessage.SEV_WARNING) - { - numwarnings++; - // If the message contains any file references make them relative. - String message = valmes.getMessage(); - message = message.replaceAll("'[^']*" + PLUGIN_NAME + "[^'/]*/", "'"); - message = message.replaceAll("[(][^(]*" + PLUGIN_NAME + "[^'/]*/", "[(]"); - warningsString.append(message + " [" + valmes.getLine() +", " + valmes.getColumn() +"]\n"); - warningsString.append(createNestedMessageString(valmes.getNestedMessages())); - } - else - { - numerrors++; - // If the message contains any file references make them relative. - String message = valmes.getMessage(); - message = message.replaceAll("'[^']*" + PLUGIN_NAME + "[^'/]*/", "'"); - message = message.replaceAll("[(][^(]*" + PLUGIN_NAME + "[^'/]*/", "("); - errorsString.append(message + " [" + valmes.getLine() +", " + valmes.getColumn() +"]\n"); - errorsString.append(createNestedMessageString(valmes.getNestedMessages())); - } - } - StringBuffer log = new StringBuffer(); - log.append("number of errors : " + numerrors + "\n"); - log.append("number of warnings : " + numwarnings + "\n\n"); - log.append("------------error list-------------------------------------------\n"); - if(numerrors == 0) - { - log.append("(none)\n"); - } - else - { - log.append(errorsString.toString()); - } - log.append("------------warning list-----------------------------------------\n"); - if(numwarnings == 0) - { - log.append("(none)\n"); - } - else - { - log.append(warningsString.toString()); - } - log.append("-----------------------------------------------------------------\n"); - - DataOutputStream outStream = null; - try - { - File logfile = new File(filename); - File parent = logfile.getParentFile(); - if (!parent.exists()) - { - parent.mkdirs(); - } - if(logfile.exists()) - { - logfile.delete(); - } - logfile.createNewFile(); - - outStream = new DataOutputStream(new FileOutputStream(filename, true)); - outStream.writeBytes(log.toString()); - outStream.close(); - - } catch (IOException e) - { - // If we can't write the log then clear the log. - log.delete(0, log.length()); - } - return log.toString(); - } - - private String createNestedMessageString(List nestedMessages) - { - return createNestedMessageString(nestedMessages, 0); - } - - private String createNestedMessageString(List nestedMessages, int depth) - { - if(nestedMessages != null && nestedMessages.size() > 0) - { - String messageString = ""; - Iterator nestedMesIter = nestedMessages.iterator(); - while(nestedMesIter.hasNext()) - { - IValidationMessage nesvalmes = (IValidationMessage)nestedMesIter.next(); - for(int i = 0; i < depth; i++) - { - messageString += " "; - } - // If the message contains any file references make them relative. - String message = nesvalmes.getMessage(); - message = message.replaceAll("'[^']*" + PLUGIN_NAME + "[^'/]*/", "'"); - message = message.replaceAll("[(][^(]*" + PLUGIN_NAME + "[^'/]*/", "[(]"); - messageString += ("-> " + message + " [" + nesvalmes.getLine() +", " + nesvalmes.getColumn() +"]\n"); - messageString += createNestedMessageString(nesvalmes.getNestedMessages(), depth + 1); - } - return messageString; - } - else - { - return ""; - } - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java deleted file mode 100644 index fe0103238..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/PathsTest.java +++ /dev/null @@ -1,569 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.tests.internal; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * Tests for file paths. - */ -public class PathsTest extends BaseTestCase -{ - private String PATHS_DIR = "Paths/"; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(PathsTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() - { - super.setUp(); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - protected void tearDown() throws Exception - { - // Delete the simple project for ImportedSchemaWithSchemaImport test - super.tearDown(); - } - - /** - * Test /Paths/Space InPath/SpaceInPathValid.wsdl - */ - public void testSpaceInPathValid() - { - String testname = "SpaceInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Space InPath/SpaceInPathInvalid.wsdl - */ - public void testSpaceInPathInvalid() - { - String testname = "SpaceInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/AngleHat^InPath/AngleHatInPathValid.wsdl - */ - public void testAngleHatInPathValid() - { - String testname = "AngleHatInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl - */ - public void testAngleHatInPathInvalid() - { - String testname = "AngleHatInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl - */ - public void testAngleHatInFilenameValid() - { - String testname = "AngleHat^InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl - */ - public void testAngleHatInFilenameInvalid() - { - String testname = "AngleHat^InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl - */ - public void testCloseBracketInPathValid() - { - String testname = "CloseBracketInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl - */ - public void testCloseBracketInPathInvalid() - { - String testname = "CloseBracketInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl - */ - public void testCloseBracketInFilenameValid() - { - String testname = "CloseBracket)InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl - */ - public void testCloseBracketInFilenameInvalid() - { - String testname = "CloseBracket)InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Dash-InPath/DashInPathValid.wsdl - */ - public void testDashInPathValid() - { - String testname = "DashInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Dash-InPath/DashInPathInvalid.wsdl - */ - public void testDashInPathInvalid() - { - String testname = "DashInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/DashInFilename/Dash-InFilenameValid.wsdl - */ - public void testDashInFilenameValid() - { - String testname = "Dash-InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/DashInFilename/Dash-InFilenameInvalid.wsdl - */ - public void testDashInFilenameInvalid() - { - String testname = "Dash-InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Exclamation!InPath/ExclamationInPathValid.wsdl - */ - public void testExclamationInPathValid() - { - String testname = "ExclamationInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl - */ - public void testExclamationInPathInvalid() - { - String testname = "ExclamationInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl - */ - public void testExclamationInFilenameValid() - { - String testname = "Exclamation!InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl - */ - public void testExclamationInFilenameInvalid() - { - String testname = "Exclamation!InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl - */ - public void testOpenBracketInPathValid() - { - String testname = "OpenBracketInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl - */ - public void testOpenBracketInPathInvalid() - { - String testname = "OpenBracketInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl - */ - public void testOpenBracketInFilenameValid() - { - String testname = "OpenBracket(InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl - */ - public void testOpenBracketInFilenameInvalid() - { - String testname = "OpenBracket(InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Period.InPath/PeriodInPathValid.wsdl - */ - public void testPeriodInPathValid() - { - String testname = "PeriodInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Period.InPath/PeriodInPathInvalid.wsdl - */ - public void testPeriodInPathInvalid() - { - String testname = "PeriodInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/PeriodInFilename/Period.InFilenameValid.wsdl - */ - public void testPeriodInFilenameValid() - { - String testname = "Period.InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl - */ - public void testPeriodInFilenameInvalid() - { - String testname = "Period.InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Quote'InPath/QuoteInPathValid.wsdl - */ - public void testQuoteInPathValid() - { - String testname = "QuoteInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Quote'InPath/QuoteInPathInvalid.wsdl - */ - public void testQuoteInPathInvalid() - { - String testname = "QuoteInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/QuoteInFilename/Quote'InFilenameValid.wsdl - */ - public void testQuoteInFilenameValid() - { - String testname = "Quote'InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl - */ - public void testQuoteInFilenameInvalid() - { - String testname = "Quote'InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/SpaceInFilename/Space InFilenameValid.wsdl - */ - public void testSpaceInFilenameValid() - { - String testname = "Space InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/SpaceInFilename/Space InFilenameInvalid.wsdl - */ - public void testSpaceInFilenameInvalid() - { - String testname = "Space InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Tilde~InPath/TildeInPathValid.wsdl - */ - public void testTildeInPathValid() - { - String testname = "TildeInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Tilde~InPath/TildeInPathInvalid.wsdl - */ - public void testTildeInPathInvalid() - { - String testname = "TildeInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/TildeInFilename/Tilde~InFilenameValid.wsdl - */ - public void testTildeInFilenameValid() - { - String testname = "Tilde~InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl - */ - public void testTildeInFilenameInvalid() - { - String testname = "Tilde~InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Underscore_InPath/UnderscoreInPathValid.wsdl - */ - public void testUnderscoreInPathValid() - { - String testname = "UnderscoreInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl - */ - public void testUnderscoreInPathInvalid() - { - String testname = "UnderscoreInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl - */ - public void testUnderscoreInFilenameValid() - { - String testname = "Underscore_InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl - */ - public void testUnderscoreInFilenameInvalid() - { - String testname = "Underscore_InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java deleted file mode 100644 index f21a232bf..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java +++ /dev/null @@ -1,499 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.tests.internal; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * WSDL validation tests for the WSDL validator. - */ -public class WSDLTest extends BaseTestCase -{ - private String WSDL_DIR = "WSDL/"; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(WSDLTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() - { - super.setUp(); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - protected void tearDown() throws Exception - { - // Delete the simple project for ImportedSchemaWithSchemaImport test - super.tearDown(); - } - - /** - * IMPORT TESTS - */ - - /** - * Test /WSDL/Import/ImportSchemaWithWSDLImport.wsdl - */ - public void testImportSchemaWithWSDLImport() - { - String testname = "ImportSchemaWithWSDLImport"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl - */ - public void testImportSchemaWithWSDLImportInvalidNS() - { - String testname = "ImportSchemaWithWSDLImportInvalidNS"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportWSDLWithWSDL.wsdl - */ - public void testImportWSDLWithWSDL() - { - String testname = "ImportWSDLWithWSDL"; - String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl - */ - public void testImportWSDLWithWSDLInvalidNS() - { - String testname = "ImportWSDLWithWSDLInvalidNS"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl - */ - public void testImportWSDLWithWSDLInvalidFilename() - { - String testname = "ImportWSDLWithWSDLInvalidFilename"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/WSDLImportingTypes.wsdl - */ - public void testWSDLImportingTypes() - { - String testname = "WSDLImportingTypes"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportNonExistantFile.wsdl - */ - public void testImportNonExistantFile() - { - String testname = "ImportNonExistantFile"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/WSDLNamespaceAAA.wsdl - */ - public void testWSDLNamespaceAAA() - { - String testname = "WSDLNamespaceAAA"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportingWSDLWithImportedSchema.wsdl - */ - public void testImportingWSDLWithImportedSchema() - { - String testname = "ImportingWSDLWithImportedSchema"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/WSDLImportingSchemaInmportingSchema.wsdl - */ - public void testWSDLImportingSchemaInmportingSchema() - { - String testname = "WSDLImportingSchemaImportingSchema"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl - */ - public void testImportXMLInvalidWSDL() - { - String testname = "ImportXMLInvalidWSDL"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportXMLInvalidWSDL/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportXMLInvalidWSDL/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportXMLInvalidWSDL/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl - */ - public void testImportOneAndTwo() - { - String testname = "ImportOneAndTwo"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/AlphabeticalOrderOfImports/one.wsdl - */ - public void testImportOneAndTwo_One() - { - String testname = "one"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/AlphabeticalOrderOfImports/two.wsdl - */ - public void testImportOneAndTwo_Two() - { - String testname = "two"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/AlphabeticalOrderOfImports/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl - */ - public void testImportEmptyLocation() - { - String testname = "ImportEmptyLocation"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportEmptyLocation/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyLocation/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyLocation/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl - */ - public void testImportEmptyNamespace() - { - String testname = "ImportEmptyNamespace"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportEmptyNamespace/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespace/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespace/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl - */ - public void testImportEmptyNamespaceAndLocation() - { - String testname = "ImportEmptyNamespaceAndLocation"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportEmptyNamespaceAndLocation/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespaceAndLocation/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportEmptyNamespaceAndLocation/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl - */ - public void testImportNoLocationAttribute() - { - String testname = "ImportNoLocationAttribute"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportNoLocationAttribute/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportNoLocationAttribute/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportNoLocationAttribute/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/SimpleImport/test-1.0.wsdl - */ - public void testSimpleImport() - { - String testname = "test-1.0"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/SimpleImport/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/SimpleImport/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/SimpleImport/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * CYCLIC TESTS - */ - - /** - * Test /WSDL/Cyclic/PorttypeRefMessage1.wsdl - */ - public void testPorttypeRefMessage1() - { - String testname = "PorttypeRefMessage1"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Cyclic/PorttypeRefMessage2.wsdl - */ - public void testPorttypeRefMessage2() - { - String testname = "PorttypeRefMessage2"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Cyclic/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfContained/ReferenceInlineTypes.wsdl - */ - public void testReferenceInlineTypes() - { - String testname = "ReferenceInlineTypes"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfContained/Empty.wsdl - */ - public void testEmpty() - { - String testname = "Empty"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl - */ - public void testSOAPBodyEncodedNoNamespace() - { - String testname = "SOAPBodyEncodedNoNamespace"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl - */ - public void testSOAPBodyEncodedWithNamespace() - { - String testname = "SOAPBodyEncodedWithNamespace"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl - */ - public void testNoDefaultNamespace() - { - String testname = "NoDefaultNamespace"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfContained/NoDefaultNamespace/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfContained/NoDefaultNamespace/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfContained/NoDefaultNamespace/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl - */ - public void testBindingInvalidStyle() - { - String testname = "BindingInvalidStyle"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "BindingElement/InvalidStyle/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidStyle/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidStyle/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl - */ - public void testBindingInvalidUse() - { - String testname = "BindingInvalidUse"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "BindingElement/InvalidUse/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidUse/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "BindingElement/InvalidUse/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl - */ - public void testMessageInvalidElement() - { - String testname = "MessageInvalidElement"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "MessageElement/InvalidElement/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidElement/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidElement/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl - */ - public void testMessageInvalidType() - { - String testname = "MessageInvalidType"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "MessageElement/InvalidType/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidType/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "MessageElement/InvalidType/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl - */ - public void testPortTypeInvalidInput() - { - String testname = "PortTypeInvalidInput"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "PortTypeElement/InvalidInput/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidInput/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidInput/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl - */ - public void testPortTypeInvalidOutput() - { - String testname = "PortTypeInvalidOutput"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "PortTypeElement/InvalidOutput/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidOutput/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "PortTypeElement/InvalidOutput/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl - */ - public void testServiceInvalidBinding() - { - String testname = "ServiceInvalidBinding"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "ServiceElement/InvalidBinding/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "ServiceElement/InvalidBinding/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "ServiceElement/InvalidBinding/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl - */ - public void testServiceNoAddress() - { - String testname = "ServiceNoAddress"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "ServiceElement/NoAddress/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "ServiceElement/NoAddress/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "ServiceElement/NoAddress/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java deleted file mode 100644 index 6ce707a03..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLValidatorTestsPlugin.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.tests.internal; - -import java.io.IOException; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class WSDLValidatorTestsPlugin extends AbstractUIPlugin -{ - //The shared instance. - private static WSDLValidatorTestsPlugin plugin; - private static Bundle pluginBundle = null; - - /** - * The constructor. - */ - public WSDLValidatorTestsPlugin() - { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception - { - super.start(context); - pluginBundle = context.getBundle(); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception - { - super.stop(context); - } - - /** - * Returns the shared instance. - */ - public static WSDLValidatorTestsPlugin getDefault() - { - return plugin; - } - - /** - * Get the install URL of this plugin. - * - * @return the install url of this plugin - */ - public static String getInstallURL() - { - try - { - return Platform.resolve(pluginBundle.getEntry("/")).getFile(); - } - catch (IOException e) - { - return null; - } - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java deleted file mode 100644 index dbb253554..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.java +++ /dev/null @@ -1,157 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsdl.validation.tests.internal; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * XSD validation tests for the WSDL validator. - */ -public class XSDTest extends BaseTestCase -{ - private String XSD_DIR = "XSD/"; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(XSDTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() - { - super.setUp(); - } - - /** - * Test /XSD/Entities/normalizeEntitiesValid.wsdl - */ - public void testNormalizeEntitiesValid() - { - String testname = "normalizeEntitiesValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "Entities/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/Entities/normalizeEntitiesInvalid.wsdl - */ - public void testNormalizeEntitiesInvalid() - { - String testname = "normalizeEntitiesInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "Entities/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "Entities/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl - */ - public void testReferToAnotherInlineType() - { - String testname = "ReferToAnotherInlineType"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ReferToAnotherInlineType/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ReferToAnotherInlineType/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ReferToAnotherInlineType/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl - */ - public void testNoImportForUnprefixedAttribute() - { - String testname = "NoImportForUnprefixedAttribute"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "InlineSchemaGeneratedImports/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "InlineSchemaGeneratedImports/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "InlineSchemaGeneratedImports/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl - */ - public void testOneErrorForInlineXSDRefInvalidInlineXSD() - { - String testname = "OneErrorForInlineXSDRefInvalidInlineXSD"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "OneErrorForInlineXSDRefInvalidInlineXSD/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "OneErrorForInlineXSDRefInvalidInlineXSD/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "OneErrorForInlineXSDRefInvalidInlineXSD/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl - */ - public void testSchemaDocElemWithSourceAndSubElem() - { - String testname = "SchemaDocElemWithSourceAndSubElem"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "SchemaDocElemWithSourceAndSubElem/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "SchemaDocElemWithSourceAndSubElem/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "SchemaDocElemWithSourceAndSubElem/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl - */ - public void testRestrictionPatternWithColon() - { - String testname = "RestrictionPatternWithColon"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "RestrictionPatternWithColon/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "RestrictionPatternWithColon/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "RestrictionPatternWithColon/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl - */ - public void testImportInlineSchemaWithInclude() - { - String testname = "ImportInlineSchemaWithInclude"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ImportInlineSchemaWithInclude/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ImportInlineSchemaWithInclude/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ImportInlineSchemaWithInclude/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/ValueColon/ValueColon.wsdl - */ - public void testValueColon() - { - String testname = "ValueColon"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ValueColon/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ValueColon/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ValueColon/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/test.xml b/tests/org.eclipse.wst.wsdl.validation.tests/test.xml deleted file mode 100644 index 6459ee346..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/test.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - - <!-- Configurable Properties --> - - <!-- sets the properties eclipse-home, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.wsdl.validation.tests"/> - - <!-- End Configurable Properties --> - - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <property name="eclipse-home" value="${basedir}\..\.."/> - <property name="bvtworkspace" value="${basedir}"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="workspace-folder" value="${bvtworkspace}/${plugin-name}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.validation.tests.*.xml"/> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - - <!-- Start with clean data workspace --> - <delete dir="${workspace-folder}" quiet="true"/> - - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.validation.tests.internal.AllWSDLTests"/> - </ant> - - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <delete dir="${workspace-folder}" quiet="true"/> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.wst.wsdl.validation.tests*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> - -</project> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore deleted file mode 100644 index bb53574d6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -generatedResults diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log deleted file mode 100644 index f9465e4a6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -XML document structures must start and end within the same entity. [2, 192] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log deleted file mode 100644 index 5e8ad54fd..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl-log +++ /dev/null @@ -1,9 +0,0 @@ -number of errors : 2 -number of warnings : 0 - -------------error list------------------------------------------- -cvc-enumeration-valid: Value 'InvalidStyle' is not facet-valid with respect to enumeration '[rpc, document]'. It must be a value from the enumeration. [22, 90] -cvc-attribute.3: The value 'InvalidStyle' of attribute 'style' on element 'soap:binding' is not valid with respect to its type, 'tStyleChoice'. [22, 90] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log deleted file mode 100644 index 6f582aeef..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl-log +++ /dev/null @@ -1,9 +0,0 @@ -number of errors : 2 -number of warnings : 0 - -------------error list------------------------------------------- -cvc-enumeration-valid: Value 'InvalidUse' is not facet-valid with respect to enumeration '[literal, encoded]'. It must be a value from the enumeration. [29, 46] -cvc-attribute.3: The value 'InvalidUse' of attribute 'use' on element 'soap:body' is not valid with respect to its type, 'useChoice'. [29, 46] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage1.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Cyclic/PorttypeRefMessage2.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log deleted file mode 100644 index 8fab638db..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The location attribute is empty. A location must be specified for the location attribute. [7, 56] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log deleted file mode 100644 index 66060b6c7..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 1 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -The file cannot be imported because the namespace '' does not match the target namespace 'http://example.com/simple/' of the imported document. [7, 53] ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log deleted file mode 100644 index 7a6ea0584..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The location attribute is empty. A location must be specified for the location attribute. [7, 42] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log deleted file mode 100644 index 9ce467896..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -cvc-complex-type.4: Attribute 'location' must appear on element 'wsdl:import'. [7, 44] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log deleted file mode 100644 index c0308f8fc..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportNonExistantFile.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 1 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -The 'ThisFileDoesntExist.wsdl' document could not be imported. Check that the document exists and that the location is correct. [3, 86] ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImport.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log deleted file mode 100644 index 9c15e431e..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 1 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -The file cannot be imported because the namespace 'http://invalidnamespace' does not match the target namespace 'http://www.example.com' of the imported document. [3, 73] ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDL.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log deleted file mode 100644 index 1fbca7949..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 1 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -The 'SIMPLEWSDL.wsdl' document could not be imported. Check that the document exists and that the location is correct. [3, 78] ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log deleted file mode 100644 index 6b62c457a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 1 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -The file cannot be imported because the namespace 'http://invalidnamespace' does not match the target namespace 'http://tempuri.org/simplewsdl/' of the imported document. [3, 78] ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log deleted file mode 100644 index ac03dc917..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log +++ /dev/null @@ -1,137 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -Referenced file contains errors (testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl). [1, 0] --> Element type "wsdl:definitions" must be followed by either attribute specifications, ">" or "/>". [4, 3] --> Attribute name "targetNamespace" associated with an element type "wsdl:definitions" must be followed by the ' = ' character. [4, 3] --> Attribute "targetNamespace" was already specified for element "wsdl:definitions". [4, 3] --> Open quote is expected for attribute "targetNamespace" associated with an element type "wsdl:definitions". [4, 3] --> Element type "wsdl:definitions" must be followed by either attribute specifications, ">" or "/>". [5, 7] --> Attribute name "xsd:schema" associated with an element type "wsdl:definitions" must be followed by the ' = ' character. [5, 18] --> Open quote is expected for attribute "xsd:schema" associated with an element type "wsdl:definitions". [5, 18] --> Element type "wsdl:definitions" must be followed by either attribute specifications, ">" or "/>". [5, 24] --> Attribute "xmlns:xsd" was already specified for element "wsdl:definitions". [5, 81] --> cvc-elt.1: Cannot find the declaration of element 'wsdl:definitions'. [5, 116] --> The element type "wsdl:definitions" must be terminated by the matching end-tag "</wsdl:definitions>". [8, 7] --> The end-tag for element type "wsdl:definitions" must end with a '>' delimiter. [8, 7] --> Content is not allowed in trailing section. [8, 7] --> Content is not allowed in trailing section. [8, 8] --> Content is not allowed in trailing section. [8, 9] --> Content is not allowed in trailing section. [8, 10] --> Content is not allowed in trailing section. [8, 11] --> Content is not allowed in trailing section. [8, 12] --> Content is not allowed in trailing section. [8, 13] --> Content is not allowed in trailing section. [8, 14] --> Content is not allowed in trailing section. [8, 15] --> Content is not allowed in trailing section. [8, 16] --> Content is not allowed in trailing section. [8, 17] --> The markup in the document following the root element must be well-formed. [9, 5] --> The markup in the document following the root element must be well-formed. [9, 5] --> The prefix "wsdl" for element "wsdl:types" is not bound. [9, 16] --> Content is not allowed in trailing section. [9, 16] --> The markup in the document following the root element must be well-formed. [10, 5] --> The prefix "wsdl" for element "wsdl:message" is not bound. [10, 46] --> Content is not allowed in trailing section. [10, 46] --> The markup in the document following the root element must be well-formed. [11, 7] --> The prefix "wsdl" for element "wsdl:part" is not bound. [11, 81] --> Content is not allowed in trailing section. [11, 81] --> The markup in the document following the root element must be well-formed. [12, 6] --> The markup in the document following the root element must be well-formed. [12, 6] --> The prefix "wsdl" for element "wsdl:message" is not bound. [12, 19] --> Content is not allowed in trailing section. [12, 19] --> The markup in the document following the root element must be well-formed. [13, 5] --> The prefix "wsdl" for element "wsdl:message" is not bound. [13, 45] --> Content is not allowed in trailing section. [13, 45] --> The markup in the document following the root element must be well-formed. [14, 7] --> The prefix "wsdl" for element "wsdl:part" is not bound. [14, 79] --> Content is not allowed in trailing section. [14, 79] --> The markup in the document following the root element must be well-formed. [15, 6] --> The markup in the document following the root element must be well-formed. [15, 6] --> The prefix "wsdl" for element "wsdl:message" is not bound. [15, 19] --> Content is not allowed in trailing section. [15, 19] --> The markup in the document following the root element must be well-formed. [16, 5] --> The prefix "wsdl" for element "wsdl:portType" is not bound. [16, 41] --> Content is not allowed in trailing section. [16, 41] --> The markup in the document following the root element must be well-formed. [17, 7] --> The prefix "wsdl" for element "wsdl:operation" is not bound. [17, 42] --> Content is not allowed in trailing section. [17, 42] --> The markup in the document following the root element must be well-formed. [18, 9] --> The prefix "wsdl" for element "wsdl:input" is not bound. [18, 55] --> Content is not allowed in trailing section. [18, 55] --> The markup in the document following the root element must be well-formed. [19, 9] --> The prefix "wsdl" for element "wsdl:output" is not bound. [19, 57] --> Content is not allowed in trailing section. [19, 57] --> The markup in the document following the root element must be well-formed. [20, 8] --> The markup in the document following the root element must be well-formed. [20, 8] --> The prefix "wsdl" for element "wsdl:operation" is not bound. [20, 23] --> Content is not allowed in trailing section. [20, 23] --> The markup in the document following the root element must be well-formed. [21, 6] --> The markup in the document following the root element must be well-formed. [21, 6] --> The prefix "wsdl" for element "wsdl:portType" is not bound. [21, 20] --> Content is not allowed in trailing section. [21, 20] --> The markup in the document following the root element must be well-formed. [22, 5] --> The prefix "wsdl" for element "wsdl:binding" is not bound. [22, 70] --> Content is not allowed in trailing section. [22, 70] --> The markup in the document following the root element must be well-formed. [23, 7] --> The prefix "soap" for element "soap:binding" is not bound. [23, 87] --> Content is not allowed in trailing section. [23, 87] --> The markup in the document following the root element must be well-formed. [24, 7] --> The prefix "wsdl" for element "wsdl:operation" is not bound. [24, 42] --> Content is not allowed in trailing section. [24, 42] --> The markup in the document following the root element must be well-formed. [25, 9] --> The prefix "soap" for element "soap:operation" is not bound. [25, 85] --> Content is not allowed in trailing section. [25, 85] --> The markup in the document following the root element must be well-formed. [26, 9] --> The prefix "wsdl" for element "wsdl:input" is not bound. [26, 20] --> Content is not allowed in trailing section. [26, 20] --> The markup in the document following the root element must be well-formed. [27, 11] --> The prefix "soap" for element "soap:body" is not bound. [27, 36] --> Content is not allowed in trailing section. [27, 36] --> The markup in the document following the root element must be well-formed. [28, 10] --> The markup in the document following the root element must be well-formed. [28, 10] --> The prefix "wsdl" for element "wsdl:input" is not bound. [28, 21] --> Content is not allowed in trailing section. [28, 21] --> The markup in the document following the root element must be well-formed. [29, 9] --> The prefix "wsdl" for element "wsdl:output" is not bound. [29, 21] --> Content is not allowed in trailing section. [29, 21] --> The markup in the document following the root element must be well-formed. [30, 11] --> The prefix "soap" for element "soap:body" is not bound. [30, 36] --> Content is not allowed in trailing section. [30, 36] --> The markup in the document following the root element must be well-formed. [31, 10] --> The markup in the document following the root element must be well-formed. [31, 10] --> The prefix "wsdl" for element "wsdl:output" is not bound. [31, 22] --> Content is not allowed in trailing section. [31, 22] --> The markup in the document following the root element must be well-formed. [32, 8] --> The markup in the document following the root element must be well-formed. [32, 8] --> The prefix "wsdl" for element "wsdl:operation" is not bound. [32, 23] --> Content is not allowed in trailing section. [32, 23] --> The markup in the document following the root element must be well-formed. [33, 6] --> The markup in the document following the root element must be well-formed. [33, 6] --> The prefix "wsdl" for element "wsdl:binding" is not bound. [33, 19] --> Content is not allowed in trailing section. [33, 19] --> The markup in the document following the root element must be well-formed. [34, 5] --> The prefix "wsdl" for element "wsdl:service" is not bound. [34, 40] --> Content is not allowed in trailing section. [34, 40] --> The markup in the document following the root element must be well-formed. [35, 7] --> The prefix "wsdl" for element "wsdl:port" is not bound. [35, 76] --> Content is not allowed in trailing section. [35, 76] --> The markup in the document following the root element must be well-formed. [36, 9] --> The prefix "soap" for element "soap:address" is not bound. [36, 57] --> Content is not allowed in trailing section. [36, 57] --> The markup in the document following the root element must be well-formed. [37, 8] --> The markup in the document following the root element must be well-formed. [37, 8] --> The prefix "wsdl" for element "wsdl:port" is not bound. [37, 18] --> Content is not allowed in trailing section. [37, 18] --> The markup in the document following the root element must be well-formed. [38, 6] --> The markup in the document following the root element must be well-formed. [38, 6] --> The prefix "wsdl" for element "wsdl:service" is not bound. [38, 19] --> Content is not allowed in trailing section. [38, 19] --> The markup in the document following the root element must be well-formed. [39, 4] --> The markup in the document following the root element must be well-formed. [39, 4] --> The prefix "wsdl" for element "wsdl:definitions" is not bound. [39, 21] --> Content is not allowed in trailing section. [39, 21] --> XML document structures must start and end within the same entity. [40, 2] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/SimpleImport/test-1.0.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLImportingTypes.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/WSDLNamespaceAAA.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log deleted file mode 100644 index 85e335f3f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The part 'NewOperationResponse' has an invalid value 'InvalidElement' defined for its element. Element declarations must refer to valid values defined in a schema. [10, 74] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log deleted file mode 100644 index 789fe6c85..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The part 'NewOperationRequest' has an invalid value 'NewOperationRequest' defined for its type. Type declarations must refer to valid values defined in a schema. [13, 75] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log deleted file mode 100644 index e6058d3bb..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The input element is referencing an undefined message 'InvalidInput'. Check that the message name and namespace are correct and that the message has been defined. [17, 47] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log deleted file mode 100644 index 991591bda..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The output element is referencing an undefined message 'InvalidOutput'. Check that the message name and namespace are correct and that the message has been defined. [18, 49] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/Empty.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/ReferenceInlineTypes.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log deleted file mode 100644 index 0640e61a4..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The 'ServiceInvalidBindingSOAP' port has an invalid binding - 'IncorrectBindingRef'. Check that the 'IncorrectBindingRef' binding is defined. [34, 83] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log deleted file mode 100644 index 68eaa9bc3..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The port 'ServiceNoAddressSOAP' has no address defined. Each port must define one address. [34, 79] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log deleted file mode 100644 index 7fdaf489f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesInvalid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -The value of attribute "value" associated with an element type "xsd:pattern" must not contain the '<' character. [11, 55] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/Entities/normalizeEntitiesValid.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log deleted file mode 100644 index 741ad151f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -src-resolve.4.2: Error resolving component 'xsd:stringa'. It was detected that 'xsd:stringa' is in namespace 'http://www.w3.org/2001/XMLSchema', but components from this namespace are not referenceable from schema document 'testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl'. If this is the incorrect namespace, perhaps the prefix of 'xsd:stringa' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl'. [7, 61] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ValueColon/ValueColon.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 0 -number of warnings : 0 - -------------error list------------------------------------------- -(none) -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl deleted file mode 100644 index 56be36867..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/">
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl deleted file mode 100644 index da27d70b0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="name" targetNamespace="http://tempuri.org/"> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl deleted file mode 100644 index e145d3833..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidStyle/BindingInvalidStyle.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="BindingInvalidStyle" targetNamespace="http://www.example.org/BindingInvalidStyle/" xmlns:tns="http://www.example.org/BindingInvalidStyle/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/BindingInvalidStyle/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="BindingInvalidStyle"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="BindingInvalidStyleSOAP" type="tns:BindingInvalidStyle"> - <soap:binding style="InvalidStyle" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://www.example.org/BindingInvalidStyle/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="BindingInvalidStyle"> - <wsdl:port name="BindingInvalidStyleSOAP" binding="tns:BindingInvalidStyleSOAP"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl deleted file mode 100644 index ae4c26951..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/BindingElement/InvalidUse/BindingInvalidUse.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="BindingInvalidUse" targetNamespace="http://www.example.org/BindingInvalidUse/" xmlns:tns="http://www.example.org/BindingInvalidUse/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/BindingInvalidUse/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="BindingInvalidUse"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="BindingInvalidUseSOAP" type="tns:BindingInvalidUse"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://www.example.org/BindingInvalidUse/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="InvalidUse"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="BindingInvalidUse"> - <wsdl:port name="BindingInvalidUseSOAP" binding="tns:BindingInvalidUseSOAP"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl deleted file mode 100644 index a3e4c5766..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage1.wsdl +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/cyclic1/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="cyclic1" targetNamespace="http://tempuri.org/cyclic1/" xmlns:cyclic2="http://tempuri.org/cyclic2/"> - <wsdl:import namespace="http://tempuri.org/cyclic2/" location="PorttypeRefMessage2.wsdl"></wsdl:import> - <wsdl:types> - <xsd:schema targetNamespace="http://tempuri.org/cyclic1/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="cyclic1"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="cyclic2:NewOperationRequest"/> - <wsdl:output message="cyclic2:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl deleted file mode 100644 index 313529157..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Cyclic/PorttypeRefMessage2.wsdl +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/cyclic2/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="cyclic2" targetNamespace="http://tempuri.org/cyclic2/" xmlns:cyclic1="http://tempuri.org/cyclic1/"> - <wsdl:import namespace="http://tempuri.org/cyclic1/" location="PorttypeRefMessage1.wsdl"></wsdl:import> - <wsdl:types> - <xsd:schema targetNamespace="http://tempuri.org/cyclic2/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="cyclic2"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="cyclic1:NewOperationRequest"/> - <wsdl:output message="cyclic1:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl deleted file mode 100644 index 9763af303..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/ImportOneAndTwo.wsdl +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - name="ImportOneAndTwo" - targetNamespace="http://ImportOneAndTwo" - xmlns:wsdl1="http://tempuri.org/one.wsdl" - xmlns:wsdl2="http://atempuri.org/two.wsdl"> - - -<wsdl:import namespace="http://tempuri.org/one.wsdl" location="one.wsdl"/> -<wsdl:import namespace="http://atempuri.org/two.wsdl" location="two.wsdl"/> - -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl deleted file mode 100644 index 320ff10a0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/one.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/one.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="one" - targetNamespace="http://tempuri.org/one.wsdl"> - - <wsdl:message name="Message"> - <wsdl:part name="Message" type="xsd:string"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl deleted file mode 100644 index 04f160cd1..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/AlphabeticalOrderOfImports/two.wsdl +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- It's important that the namespace of this document start with an a as it should - be imported first by ImportOneAndTwo.wsdl. The order of the imports is determined - by alphabetical order of the namespaces in this defect. --> -<wsdl:definitions xmlns:tns="http://atempuri.org/two.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="two" - targetNamespace="http://atempuri.org/two.wsdl" - xmlns:wsdl1="http://tempuri.org/one.wsdl" xmlns:wsdl2="http://atempuri.org/two.wsdl"> - <wsdl:import namespace="http://tempuri.org/one.wsdl" - location="one.wsdl"> - </wsdl:import> - <wsdl:portType name="PortType"> - <wsdl:operation name="Operation"> - <wsdl:input message="wsdl1:Message" name="Input"/> - <wsdl:output message="wsdl1:Message" name="Output"/> - </wsdl:operation> - </wsdl:portType> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl deleted file mode 100644 index eab89600a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyLocation/ImportEmptyLocation.wsdl +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://example.com/ImportEmptyLocation/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="ImportEmptyLocation" - targetNamespace="http://example.com/ImportEmptyLocation/"> - <wsdl:import namespace="http://someuri" location=""/> - <wsdl:message name="message"> - <wsdl:part name="message" type="xsd:string"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl deleted file mode 100644 index c9eaf7013..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/ImportEmptyNamespace.wsdl +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://example.com/ImportEmptyNamespace/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="ImportEmptyNamespace" - targetNamespace="http://example.com/ImportEmptyNamespace/"> - <wsdl:import namespace="" location="simple.wsdl"/> - <wsdl:message name="message"> - <wsdl:part name="message" type="xsd:string"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl deleted file mode 100644 index 100f098d3..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespace/simple.wsdl +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://example.com/simple/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - name="simple" - targetNamespace="http://example.com/simple/"> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl deleted file mode 100644 index 713521620..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportEmptyNamespaceAndLocation/ImportEmptyNamespaceAndLocation.wsdl +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://example.com/ImportEmptyNamespaceAndLocation/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="ImportEmptyNamespaceAndLocation" - targetNamespace="http://example.com/ImportEmptyNamespaceAndLocation/"> - <wsdl:import namespace="" location=""/> - <wsdl:message name="message"> - <wsdl:part name="message" type="xsd:string"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl deleted file mode 100644 index 50022785a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNoLocationAttribute/ImportNoLocationAttribute.wsdl +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://example.com/ImportNoLocationAttribute/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="ImportNoLocationAttribute" - targetNamespace="http://example.com/ImportNoLocationAttribute/"> - <wsdl:import namespace="http://someuri"/> - <wsdl:message name="message"> - <wsdl:part name="message" type="xsd:string"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl deleted file mode 100644 index 4776750c5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportNonExistantFile.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportNonExistantFile/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportNonExistantFile" targetNamespace="http://tempuri.org/ImportNonExistantFile/"> - <wsdl:import namespace="http://nonexistingfile" location="ThisFileDoesntExist.wsdl"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl deleted file mode 100644 index efaeeb062..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImport.wsdl +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportSchemaWithWSDLImport/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportSchemaWithWSDLImport" targetNamespace="http://tempuri.org/ImportSchemaWithWSDLImport/" xmlns:schema="http://www.example.com"> - <wsdl:import namespace="http://www.example.com" location="schema.xsd"></wsdl:import> - <wsdl:message name="NewMessage"> - <wsdl:part name="NewMessage" element="schema:NewGlobalElement"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl deleted file mode 100644 index 241a0249e..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportSchemaWithWSDLImportInvalidNS.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportSchemaWithWSDLImportInvalidNS/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportSchemaWithWSDLImportInvalidNS" targetNamespace="http://tempuri.org/ImportSchemaWithWSDLImportInvalidNS/"> - <wsdl:import namespace="http://invalidnamespace" location="schema.xsd"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl deleted file mode 100644 index 178e2f25e..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDL.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportWSDLWithWSDL/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportWSDLWithWSDL" targetNamespace="http://tempuri.org/ImportWSDLWithWSDL/"> - <wsdl:import namespace="http://tempuri.org/simplewsdl/" location="simplewsdl.wsdl"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl deleted file mode 100644 index 8ebb93a29..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidFilename.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportWSDLWithWSDLInvalidFilename/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportWSDLWithWSDLInvalidFilename" targetNamespace="http://tempuri.org/ImportWSDLWithWSDLInvalidFilename/"> - <wsdl:import namespace="http://invalidnamespace" location="SIMPLEWSDL.wsdl"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl deleted file mode 100644 index ef82ea567..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWSDLWithWSDLInvalidNS.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportWSDLWithWSDLInvalidNS/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportWSDLWithWSDLInvalidNS" targetNamespace="http://tempuri.org/ImportWSDLWithWSDLInvalidNS/"> - <wsdl:import namespace="http://invalidnamespace" location="simplewsdl.wsdl"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl deleted file mode 100644 index 9ea7889ac..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportXMLInvalidWSDL/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportXMLInvalidWSDL" targetNamespace="http://tempuri.org/ImportXMLInvalidWSDL/"> - <wsdl:import namespace="http://tempuri.org/XMLInvalidWSDL/" location="XMLInvalidWSDL.wsdl"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl deleted file mode 100644 index 1192d81e1..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportXMLInvalidWSDL/XMLInvalidWSDL.wsdl +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- The definitions element isn't closed. --> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/XMLInvalidWSDL/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="XMLInvalidWSDL" targetNamespace="http://tempuri.org/XMLInvalidWSDL/" - <wsdl:types> - <xsd:schema targetNamespace="http://tempuri.org/XMLInvalidWSDL/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part element="tns:NewOperationResponse" name="NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="XMLInvalidWSDL"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="XMLInvalidWSDLSOAP" type="tns:XMLInvalidWSDL"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://tempuri.org/XMLInvalidWSDL/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="XMLInvalidWSDL"> - <wsdl:port binding="tns:XMLInvalidWSDLSOAP" name="XMLInvalidWSDLSOAP"> - <soap:address location="http://www.example.com"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd deleted file mode 100644 index 76ffdcc26..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingSchemaNotInDir.xsd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ImportingSchemaNotInDir="http://www.example.com" xmlns:plainschema="http://plainschema"> - <import namespace="http://plainschema" schemaLocation="subfolder/PlainSchema.xsd"></import> - <element name="NewGlobalElement" type="plainschema:NewSimpleType"></element> - -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl deleted file mode 100644 index 269c7c068..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportingWSDLWithImportedSchema.wsdl +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportingWSDLWithImportedSchema/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportingWSDLWithImportedSchema" targetNamespace="http://tempuri.org/ImportingWSDLWithImportedSchema/" xmlns:wsdl1="http://tempuri.org/ImportedImportingSchema/"> - <wsdl:import namespace="http://tempuri.org/ImportedImportingSchema/" location="subfolder/ImportedImportingSchema.wsdl"></wsdl:import> - <wsdl:message name="NewMessage"> - <wsdl:part name="NewMessage" element="wsdl1:NewGlobalElement"></wsdl:part> - </wsdl:message> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd deleted file mode 100644 index 8750d4509..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SchemaNamespaceAAA.xsd +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://AAA" xmlns:SchemaNamespaceAAA="http://www.example.com"> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl deleted file mode 100644 index b673bac5a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/import-1.0.wsdl +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions - xmlns:tns="http://www.example.com/wsdl/import-1.0.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="import-1.0" - targetNamespace="http://www.example.com/wsdl/import-1.0.wsdl" /> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl deleted file mode 100644 index b9e39b74e..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/SimpleImport/test-1.0.wsdl +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://www.example.com/wsdl/test-1.0.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="test-1.0" - targetNamespace="http://www.example.com/wsdl/test-1.0.wsdl" - xmlns:wsdl1="http://www.example.com/wsdl/import-1.0.wsdl"> - <wsdl:import namespace="http://www.example.com/wsdl/import-1.0.wsdl" - location="import-1.0.wsdl" /> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl deleted file mode 100644 index 37be78fad..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingSchemaImportingSchema.wsdl +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/WSDLImportingSchemaImportingSchema/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLImportingSchemaImportingSchema" targetNamespace="http://tempuri.org/WSDLImportingSchemaImportingSchema/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:import namespace="http://www.example.com" schemaLocation="ImportingSchemaNotInDir.xsd"/> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl deleted file mode 100644 index d4437fd72..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLImportingTypes.wsdl +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/WSDLImportingTypes/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLImportingTypes" targetNamespace="http://tempuri.org/WSDLImportingTypes/" xmlns:wsdl1="http://tempuri.org/WSDLOnlyTypes/"> - <wsdl:import namespace="http://tempuri.org/WSDLOnlyTypes/" location="WSDLOnlyTypes.wsdl"></wsdl:import> - <wsdl:message name="NewMessage"> - <wsdl:part name="NewMessage" element="wsdl1:NewGlobalElement"></wsdl:part> - </wsdl:message> - -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl deleted file mode 100644 index d6c18ddfc..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLNamespaceAAA.wsdl +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://AAA" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLNamespaceAAA" targetNamespace="http://AAA"> - <wsdl:import namespace="http://AAA" location="SchemaNamespaceAAA.xsd"></wsdl:import> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl deleted file mode 100644 index faf4f64bc..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/WSDLOnlyTypes.wsdl +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/WSDLOnlyTypes/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="WSDLOnlyTypes" targetNamespace="http://tempuri.org/WSDLOnlyTypes/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/WSDLOnlyTypes/"> - <xsd:element name="NewGlobalElement" type="xsd:string"></xsd:element></xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd deleted file mode 100644 index 83ee50a68..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/schema.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:schema="http://www.example.com"> - <element name="NewGlobalElement" type="string"></element> - -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl deleted file mode 100644 index 59f37ad15..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/simplewsdl.wsdl +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/simplewsdl/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="simplewsdl" targetNamespace="http://tempuri.org/simplewsdl/"/> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl deleted file mode 100644 index 2c2fd2a20..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedImportingSchema.wsdl +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ImportedImportingSchema/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportedImportingSchema" targetNamespace="http://tempuri.org/ImportedImportingSchema/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/ImportedImportingSchema/" - xmlns:ImportedWSDLImportedSchema="http://ImportedWSDLImportedSchema"> - <xsd:import namespace="http://ImportedWSDLImportedSchema" schemaLocation="ImportedWSDLImportedSchema.xsd"></xsd:import> - <xsd:element name="NewGlobalElement" type="ImportedWSDLImportedSchema:NewSimpleType"></xsd:element></xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd deleted file mode 100644 index 1502c0007..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/ImportedWSDLImportedSchema.xsd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://ImportedWSDLImportedSchema" xmlns:ImportedWSDLImportedSchema="http://ImportedWSDLImportedSchema"> - <simpleType name="NewSimpleType"> - <restriction base="string"> - <minLength value="1"/> - </restriction> - </simpleType> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd deleted file mode 100644 index 3ede75858..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/subfolder/PlainSchema.xsd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://plainschema" xmlns:PlainSchema="http://www.example.com"> - <simpleType name="NewSimpleType"> - <restriction base="string"> - <minLength value="1"/> - </restriction> - </simpleType> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl deleted file mode 100644 index 90be23e4f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidElement/MessageInvalidElement.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="MessageInvalidElement" targetNamespace="http://www.example.org/MessageInvalidElement/" xmlns:tns="http://www.example.org/MessageInvalidElement/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/MessageInvalidElement/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:InvalidElement"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="MessageInvalidElement"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="MessageInvalidElementSOAP" type="tns:MessageInvalidElement">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/MessageInvalidElement/NewOperation"/> - <wsdl:input>
- <soap:body use="literal"/> - </wsdl:input> - <wsdl:output>
- <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="MessageInvalidElement"> - <wsdl:port name="MessageInvalidElementSOAP" binding="tns:MessageInvalidElementSOAP"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl deleted file mode 100644 index fc4ededce..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/MessageElement/InvalidType/MessageInvalidType.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="NewWSDLFile" targetNamespace="http://www.example.org/NewWSDLFile/" xmlns:tns="http://www.example.org/NewWSDLFile/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NewWSDLFile/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" type="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="NewWSDLFile"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="NewWSDLFileSOAP" type="tns:NewWSDLFile"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://www.example.org/NewWSDLFile/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="NewWSDLFile"> - <wsdl:port name="NewWSDLFileSOAP" binding="tns:NewWSDLFileSOAP"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl deleted file mode 100644 index 0f02b2637..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidInput/PortTypeInvalidInput.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="PortTypeInvalidInput" targetNamespace="http://www.example.org/PortTypeInvalidInput/" xmlns:tns="http://www.example.org/PortTypeInvalidInput/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/PortTypeInvalidInput/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="PortTypeInvalidInput"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:InvalidInput"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="PortTypeInvalidInputSOAP" type="tns:PortTypeInvalidInput">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/PortTypeInvalidInput/NewOperation"/> - <wsdl:input>
- <soap:body use="literal"/> - </wsdl:input> - <wsdl:output>
- <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="PortTypeInvalidInput"> - <wsdl:port name="PortTypeInvalidInputSOAP" binding="tns:PortTypeInvalidInputSOAP"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl deleted file mode 100644 index 2dd1b6ce3..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/PortTypeElement/InvalidOutput/PortTypeInvalidOutput.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="PortTypeInvalidOutput" targetNamespace="http://www.example.org/PortTypeInvalidOutput/" xmlns:tns="http://www.example.org/PortTypeInvalidOutput/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/PortTypeInvalidOutput/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="PortTypeInvalidOutput"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:InvalidOutput"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="PortTypeInvalidOutputSOAP" type="tns:PortTypeInvalidOutput">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation">
- <soap:operation soapAction="http://www.example.org/PortTypeInvalidOutput/NewOperation"/> - <wsdl:input>
- <soap:body use="literal"/> - </wsdl:input> - <wsdl:output>
- <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="PortTypeInvalidOutput"> - <wsdl:port name="PortTypeInvalidOutputSOAP" binding="tns:PortTypeInvalidOutputSOAP"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl deleted file mode 100644 index e69de29bb..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/Empty.wsdl +++ /dev/null diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl deleted file mode 100644 index e733e8799..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/NoDefaultNamespace/NoDefaultNamespace.wsdl +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/NoDefaultNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NoDefaultNamespace" targetNamespace="http://tempuri.org/NoDefaultNamespace/"> - <wsdl:documentation> - <elementNoNamespace/> - </wsdl:documentation> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl deleted file mode 100644 index 6bc1331e5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/ReferenceInlineTypes.wsdl +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ReferenceInlineTypes/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReferenceInlineTypes" targetNamespace="http://tempuri.org/ReferenceInlineTypes/"> - <wsdl:message name="NewMessage"> - <wsdl:part name="NewMessage" element="tns:NewGlobalElement"></wsdl:part> - </wsdl:message> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/ReferenceInlineTypes/"> - <xsd:element name="NewGlobalElement" type="xsd:string"></xsd:element></xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl deleted file mode 100644 index 94ebcd872..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedNoNamespace.wsdl +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/SOAPBodyEncodedNoNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SOAPBodyEncodedNoNamespace" targetNamespace="http://tempuri.org/SOAPBodyEncodedNoNamespace/"> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" type="xsd:string"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" type="xsd:string"/> - </wsdl:message> - <wsdl:portType name="SOAPBodyEncodedNoNamespace"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SOAPBodyEncodedNoNamespaceSOAP" type="tns:SOAPBodyEncodedNoNamespace"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://tempuri.org/SOAPBodyEncodedNoNamespace/NewOperation"/> - <wsdl:input> - <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/> - </wsdl:input> - <wsdl:output> - <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SOAPBodyEncodedNoNamespace"> - <wsdl:port binding="tns:SOAPBodyEncodedNoNamespaceSOAP" name="SOAPBodyEncodedNoNamespaceSOAP"> - <soap:address location="http://www.example.com"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl deleted file mode 100644 index e1413fbff..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfContained/SOAPBodyEncodedWithNamespace.wsdl +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/SOAPBodyEncodedWithNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SOAPBodyEncodedWithNamespace" targetNamespace="http://tempuri.org/SOAPBodyEncodedWithNamespace/"> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" type="xsd:string"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" type="xsd:string"/> - </wsdl:message> - <wsdl:portType name="SOAPBodyEncodedWithNamespace"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SOAPBodyEncodedWithNamespaceSOAP" type="tns:SOAPBodyEncodedWithNamespace"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://tempuri.org/SOAPBodyEncodedWithNamespace/NewOperation"/> - <wsdl:input> - <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://tempuri.org/SOAPBodyEncodedWithNamespace/" use="encoded"/> - </wsdl:input> - <wsdl:output> - <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://tempuri.org/SOAPBodyEncodedWithNamespace/" use="encoded"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SOAPBodyEncodedWithNamespace"> - <wsdl:port binding="tns:SOAPBodyEncodedWithNamespaceSOAP" name="SOAPBodyEncodedWithNamespaceSOAP"> - <soap:address location="http://www.example.com"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl deleted file mode 100644 index 29376a5ab..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/InvalidBinding/ServiceInvalidBinding.wsdl +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="ServiceInvalidBinding" targetNamespace="http://www.example.org/ServiceInvalidBinding/" xmlns:tns="http://www.example.org/ServiceInvalidBinding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/ServiceInvalidBinding/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="ServiceInvalidBinding"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="ServiceInvalidBindingSOAP" type="tns:ServiceInvalidBinding"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://www.example.org/ServiceInvalidBinding/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="ServiceInvalidBinding"> - <wsdl:port name="ServiceInvalidBindingSOAP" binding="tns:IncorrectBindingRef"> - <soap:address location="http://www.example.org/"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl deleted file mode 100644 index c7a07ffd2..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/ServiceElement/NoAddress/ServiceNoAddress.wsdl +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="ServiceNoAddress" targetNamespace="http://www.example.org/ServiceNoAddress/" xmlns:tns="http://www.example.org/ServiceNoAddress/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/ServiceNoAddress/"> - <xsd:element name="NewOperationResponse" type="xsd:string"/> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationResponse"> - <wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/> - </wsdl:message> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/> - </wsdl:message> - <wsdl:portType name="ServiceNoAddress"> - <wsdl:operation name="NewOperation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="ServiceNoAddressSOAP" type="tns:ServiceNoAddress"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="NewOperation"> - <soap:operation soapAction="http://www.example.org/ServiceNoAddress/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="ServiceNoAddress"> - <wsdl:port name="ServiceNoAddressSOAP" binding="tns:ServiceNoAddressSOAP"> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd deleted file mode 100644 index df7195ad0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema1.xsd +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/schema1" xmlns:tns="http://www.example.org/schema1"> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd deleted file mode 100644 index 554dfd7de..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/CatalogSchemas/schema2.xsd +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/schema2" xmlns:tns="http://www.example.org/schema2"> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl deleted file mode 100644 index 5f7229a75..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesInvalid.wsdl +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Invalid test for Eclipse defect 70670. --> -<wsdl:definitions xmlns:tns="http://tempuri.org/normalizeEntitiesInvalid/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="normalizeEntitiesInvalid" targetNamespace="http://tempuri.org/normalizeEntitiesInvalid/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/normalizeEntitiesInvalid/"> - <xsd:element name="aString"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="F|<|>|~|H|J|x"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:element> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl deleted file mode 100644 index e75ea4af6..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/Entities/normalizeEntitiesValid.wsdl +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Valid test for Eclipse defect 70670. --> -<wsdl:definitions xmlns:tns="http://tempuri.org/normalizeEntitesValid/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="normalizeEntitesValid" targetNamespace="http://tempuri.org/normalizeEntitesValid/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/normalizeEntitesValid/"> - <xsd:element name="aString"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="F|<|>|~|H|J|x"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:element> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl deleted file mode 100644 index 038783166..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/ImportInlineSchemaWithInclude.wsdl +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name="ImportInlineSchemaWithInclude" - xmlns="http://schemas.xmlsoap.org/wsdl/" - targetNamespace="http://test.com/ImportInlineSchemaWithInclude" - xmlns:tns="http://test.com/ImportInlineSchemaWithInclude" - xmlns:sch="http://test.com/schema" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <types> - <xsd:schema targetNamespace="http://test.com/schema"> - <xsd:include schemaLocation="schema.xsd"/> - </xsd:schema> - - <xsd:schema targetNamespace="http://test.com/ImportInlineSchemaWithInclude" xmlns:sch="http://test.com/schema"> - <xsd:import namespace="http://test.com/schema"/> - <xsd:element name="Element" type="sch:MyType"/> - </xsd:schema> - </types> - - <message name="request"> - <part name="part" element="tns:Element"/> - </message> - -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd deleted file mode 100644 index f506e7b72..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportInlineSchemaWithInclude/schema.xsd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://test.com/schema" - xmlns:tns="http://test.com/schema"> - - <complexType name="MyType"> - <attribute name="attone" type="string" use="required"/> - <attribute name="atttwo" type="string" use="required"/> - </complexType> - -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl deleted file mode 100644 index 10079cb3f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaGeneratedImports/NoImportForUnprefixedAttribute.wsdl +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://www.example.com/NoImportForUnprefixedAttribute/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" name="NoImportForUnprefixedAttribute" targetNamespace="http://www.example.com/NoImportForUnprefixedAttribute/"> - <wsdl:types> - <xs:schema targetNamespace="http://www.example.com/NoImportForUnprefixedAttribute/" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:complexType name="typeWithMinMaxOccurs"> - <xs:sequence> - <xs:element minOccurs="1" maxOccurs="1" name="elem1" type="xs:string"/> - <xs:element minOccurs="1" maxOccurs="1" name="elem2" type="xs:string"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="typeWithRestriction"> - <xs:sequence> - <xs:element name="elem3"> - <xs:simpleType> - <xs:restriction base="xs:NMTOKEN"> - <xs:enumeration value="something"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:schema> - </wsdl:types> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl deleted file mode 100644 index 54a54dea1..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OneErrorForInlineXSDRefInvalidInlineXSD" targetNamespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/" xmlns:xsd1="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1" xmlns:xsd2="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1"> - <xsd:element name="NewGlobalElement" type="xsd:stringa"></xsd:element> - </xsd:schema> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/2"> - <xsd:complexType name="NewComplexType"> - <xsd:sequence> - <xsd:element ref="xsd1:NewGlobalElement"></xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl deleted file mode 100644 index 9598fdac5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ReferToAnotherInlineType/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReferToAnotherInlineType" targetNamespace="http://tempuri.org/ReferToAnotherInlineType/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/ReferToAnotherInlineType1/" - xmlns:two="http://tempuri.org/ReferToAnotherInlineType2/"> - <xsd:simpleType name="NewSimpleType"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:element name="NewGlobalElement" type="two:NewSimpleType"></xsd:element> - </xsd:schema> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/ReferToAnotherInlineType2/" - xmlns:one="http://tempuri.org/ReferToAnotherInlineType1/"> - <xsd:simpleType name="NewSimpleType"> - <xsd:restriction base="xsd:string"> - <xsd:minLength value="1"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:element name="NewGlobalElement" type="one:NewSimpleType"></xsd:element> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl deleted file mode 100644 index 6b1437c2b..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/RestrictionPatternWithColon/RestrictionPatternWithColon.wsdl +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/RestrictionPatternWithColon/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RestrictionPatternWithColon" targetNamespace="http://tempuri.org/RestrictionPatternWithColon/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/RestrictionPatternWithColon/"> - <xsd:simpleType name="time"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="([0-9]{2}:[0-9]{2}:[0-9]{2})|(#empty value)"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl deleted file mode 100644 index 4ccf61424..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/SchemaDocElemWithSourceAndSubElem/SchemaDocElemWithSourceAndSubElem.wsdl +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions targetNamespace="http://sample/" - xmlns:tns="http://sample/" - xmlns:ex="http://www.example.com" - xmlns="http://schemas.xmlsoap.org/wsdl/"> - <types> - <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.example.com" targetNamespace="http://www.example.com" elementFormDefault="qualified" attributeFormDefault="unqualified"> - <xs:complexType name="Name"> - <xs:annotation> - <xs:documentation source="http://www.example.com"> - <choice /> - </xs:documentation> - </xs:annotation> - </xs:complexType> - </xs:schema> - </types> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl deleted file mode 100644 index 294339ab8..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ValueColon/ValueColon.wsdl +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://tempuri.org/ValueColon/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ValueColon" - targetNamespace="http://tempuri.org/ValueColon/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://tempuri.org/ValueColon/"> - <xsd:element name="MyElement"> - <xsd:annotation> - <xsd:appinfo source="http://sample.com"> - <xsd:initialValue kind="string_value" value=":"/> - </xsd:appinfo> - </xsd:annotation> - </xsd:element> - </xsd:schema> - </wsdl:types> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/.classpath b/tests/org.eclipse.wst.wsi.tests/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.wst.wsi.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.wsi.tests/.cvsignore b/tests/org.eclipse.wst.wsi.tests/.cvsignore deleted file mode 100644 index ff8300b4c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -temp.folder -wsi.tests.jar -build.xml diff --git a/tests/org.eclipse.wst.wsi.tests/.project b/tests/org.eclipse.wst.wsi.tests/.project deleted file mode 100644 index 3d94a0436..000000000 --- a/tests/org.eclipse.wst.wsi.tests/.project +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.wsi.tests</name> - <comment></comment> - <projects> - <project>com.ibm.etools.wsdl</project> - <project>com.ibm.wsdl</project> - <project>org.apache.xerces</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime.compatibility</project> - <project>org.eclipse.emf.ecore</project> - <project>org.eclipse.ui</project> - <project>org.eclipse.xsd</project> - <project>org.junit</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 99997d509..000000000 --- a/tests/org.eclipse.wst.wsi.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: WSI JUnit Test -Bundle-SymbolicName: org.eclipse.wst.wsi.tests -Bundle-Version: 1.0.0 -Bundle-ClassPath: wsi.tests.jar -Bundle-Activator: org.eclipse.wst.wsi.tests.internal.WSITestsPlugin -Bundle-Vendor: Eclipse -Bundle-Localization: plugin -Require-Bundle: org.eclipse.wst.wsi, - org.eclipse.core.resources, - org.junit, - org.wsdl4j, - org.eclipse.osgi, - org.eclipse.core.runtime, - org.eclipse.wst.command.env, - org.eclipse.wst.command.env.core -Eclipse-AutoStart: true -Export-Package: org.eclipse.wst.wsi.tests.internal diff --git a/tests/org.eclipse.wst.wsi.tests/about.html b/tests/org.eclipse.wst.wsi.tests/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/build.properties b/tests/org.eclipse.wst.wsi.tests/build.properties deleted file mode 100644 index 703ed845d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -source.wsi.tests.jar = src/ -output.wsi.tests.jar = bin/ -bin.includes = plugin.xml,\ - wsi.tests.jar,\ - testResources/,\ - test.xml,\ - runtests.bat,\ - META-INF/,\ - META-INF/,\ - about.html diff --git a/tests/org.eclipse.wst.wsi.tests/plugin.xml b/tests/org.eclipse.wst.wsi.tests/plugin.xml deleted file mode 100644 index 7bf65fb5f..000000000 --- a/tests/org.eclipse.wst.wsi.tests/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - -</plugin> diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java deleted file mode 100644 index a97e9df5c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/CoreWSDLConformanceTest.java +++ /dev/null @@ -1,289 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002-2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.wsi.tests.internal; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import javax.wsdl.Binding; -import javax.wsdl.Definition; -import javax.wsdl.Message; -import javax.wsdl.Port; -import javax.wsdl.PortType; -import javax.wsdl.Service; -import javax.wsdl.xml.WSDLReader; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import junit.framework.TestCase; - -import org.eclipse.wst.wsi.internal.WSIPreferences; -import org.eclipse.wst.wsi.internal.WSITestToolsProperties; -import org.eclipse.wst.wsi.internal.analyzer.WSDLAnalyzer; -import org.eclipse.wst.wsi.internal.core.wsdl.WSDLReaderImpl; -import org.eclipse.wst.wsi.internal.core.xml.XMLUtils; -import org.eclipse.wst.wsi.internal.report.AssertionError; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - -public class CoreWSDLConformanceTest extends TestCase -{ - public static final String WSDL_BASE_DIRECTORY = "testResources/samples/wsdl"; - public static final String TEST_CASE_FILE = "testcase.xml"; - public static final String WSDL_EXTENSION = ".wsdl"; - - public static final String TAD_ID_AP = "AP10"; - public static final String TAD_ID_SSBP = "SSBP10"; - - protected String pluginURI = null; - protected String tadID = TAD_ID_AP; - - public CoreWSDLConformanceTest(String name) - { - super(name); - pluginURI = WSITestsPlugin.getInstallURL(); - } - - protected void setup() - { - - } - - /** - * JUnit test: validate the wsdl document against the specified WS-I Profile. - * @param tad he WS-I Test Assertion Document - * @param testName the name of the test containing the wsdl document - */ - protected void runTest(String category, String testName, String tadID) - { - this.tadID = tadID; - - assertNotNull("Problems determining base url", pluginURI); - String testDirectory = pluginURI + WSDL_BASE_DIRECTORY + "/" + category + "/" + testName; - String wsdlFile = "file://" + testDirectory + "/" + testName + WSDL_EXTENSION; - String testcaseFile = testDirectory + "/" + TEST_CASE_FILE; - - // validate the WSDL document - WSDLAnalyzer analyzer = validateConformance(wsdlFile, tadID); - assertNotNull("Unknown problems during validation", analyzer); - - // retrieve the expected assertion failures - List expectedErrors = getExpectedAssertionFailures(testcaseFile); - assertNotNull("Problems retrieving expected failures", expectedErrors); - - // compare the actual errors with the expected errors - analyzeResults(analyzer.getAssertionErrors(), expectedErrors); - } - - /** - * Validate the wsdl document against the specified WS-I Profile. - * @param tad the WS-I Test Assertion Document - * @param filename the wsdl document - * @return the WSDLAnalyzer object containing the validation results - */ - protected WSDLAnalyzer validateConformance(String filename, String tadID) - { - WSDLAnalyzer analyzer = null; - try - { - WSIPreferences preferences = new WSIPreferences(); - preferences.setComplianceLevel( WSITestToolsProperties.STOP_NON_WSI); - preferences.setTADFile(getTADURI(tadID)); - - analyzer = new WSDLAnalyzer(filename, preferences); - setConfigurations(filename, analyzer); - - // run the conformance check and add errors and warnings as needed - analyzer.validateConformance(); - } - catch (Exception e) - { - return null; - } - return analyzer; - } - - /** - * Retrieve the expected assertion failures. - * @param filename - the location of the testcase.xml file. - * @return the expected assertion failures. - */ - protected List getExpectedAssertionFailures(String filename) - { - List assertionFailures = new ArrayList(); - try - { - DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document doc = builder.parse(filename); - NodeList list = doc.getElementsByTagName("assertion"); - if (list != null) - for (int i=0; i<list.getLength(); i++) - { - Element element = (Element)list.item(i); - String tad = element.getAttribute("tadID"); - if ((tad != null) && tad.equals(this.tadID)) - assertionFailures.add(element.getAttribute("id")); - } - } - catch (Exception e) - { - assertionFailures = null; - } - return assertionFailures; - } - - /** - * Compare the actual errors with the expected errors. - * @param errors the actual assertion failures - * @param expectedErrors the expected assertion failures - */ - protected void analyzeResults(List errors, List expectedErrors) - { - List actualErrors = new ArrayList(); - if ((errors != null) && (expectedErrors != null)) - { - Iterator i = errors.iterator(); - while (i.hasNext()) - { - AssertionError e = (AssertionError)i.next(); - String assertionId = e.getAssertionID(); - actualErrors.add(assertionId); - - if (!expectedErrors.contains(assertionId)) - { - fail("Unexpected assertion failure: " + assertionId); - } - } - - i = expectedErrors.iterator(); - while (i.hasNext()) - { - String assertionId = (String)i.next(); - - if (!actualErrors.contains(assertionId)) - { - fail("Expected assertion failure: " + assertionId); - } - } - assertEquals(expectedErrors.size(), errors.size()); - } - } - - /** - * Gather configuration information from the WSDL file. - * @param fileName the wsdl location. - * @param a WSDLAnalyzer object containg configuration info. - */ - protected void setConfigurations(String filename, WSDLAnalyzer analyzer) - { - try - { - WSDLReader wsdlReader = new WSDLReaderImpl(); - - // Set features - wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_VERBOSE, false); - wsdlReader.setFeature(com.ibm.wsdl.Constants.FEATURE_IMPORT_DOCUMENTS, true); - - // Parse the WSDL document - Document document = XMLUtils.parseXMLDocument(filename); - Definition definition = wsdlReader.readWSDL(filename, document); - //Definition definition = reader.readWSDL(filename); - - String namespace = definition.getTargetNamespace(); - - // get all the collections we may need to validate - Collection services = definition.getServices().values(); - Collection bindings = definition.getBindings().values(); - Collection portTypes = definition.getPortTypes().values(); - Collection messages = definition.getMessages().values(); - - // The WS-I conformance tools require that each service be analyzed separately. - // Get all the services and analyze them. - if (services != null && !services.isEmpty()) - { - Iterator serviceIterator = services.iterator(); - - while (serviceIterator.hasNext()) - { - Service service = (Service) serviceIterator.next(); - - String servicename = service.getQName().getLocalPart(); - - Collection ports = service.getPorts().values(); - if (ports != null && !ports.isEmpty()) - { - // The WS-I tools must be called once for each port within each service. - Iterator portIterator = ports.iterator(); - while (portIterator.hasNext()) - { - Port port = (Port) portIterator.next(); - analyzer.addConfigurationToTest(servicename, namespace, port.getName(), WSDLAnalyzer.PORT); - } - } - // validate at the binding level - check for every binding - else if (bindings != null && !bindings.isEmpty()) - { - Iterator bindingIterator = bindings.iterator(); - - while (bindingIterator.hasNext()) - { - Binding binding = (Binding) bindingIterator.next(); - String bindingname = binding.getQName().getLocalPart(); - analyzer.addConfigurationToTest(null, namespace, bindingname, WSDLAnalyzer.BINDING); - } - } - // validate at the portType level - check for every portType - else if (portTypes != null && !portTypes.isEmpty()) - { - Iterator portTypeIterator = portTypes.iterator(); - while (portTypeIterator.hasNext()) - { - PortType portType = (PortType) portTypeIterator.next(); - String portTypename = portType.getQName().getLocalPart(); - analyzer.addConfigurationToTest(null, namespace, portTypename, WSDLAnalyzer.PORTTYPE); - } - } - // validate at the message level - check for every message - else if (messages != null && !messages.isEmpty()) - { - Iterator messageIterator = messages.iterator(); - while (messageIterator.hasNext()) - { - Message message = (Message) messageIterator.next(); - String messagename = message.getQName().getLocalPart(); - analyzer.addConfigurationToTest(null, namespace, messagename, WSDLAnalyzer.MESSAGE); - } - } - } - } - } - catch (Exception e) - { - fail("Unexpected problems setting configurations"); - } - } - - /** - * Return the location of the given tad. - * @param tid the tad id. - * @return the location of the tad. - */ - protected String getTADURI(String tid) - { - if (tid.equals(TAD_ID_AP)) - return WSITestToolsProperties.AP_ASSERTION_FILE; - else - return WSITestToolsProperties.SSBP_ASSERTION_FILE; - } -} diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java deleted file mode 100644 index 07059b509..000000000 --- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/RegressionBucket.java +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (c) 2001, 2004 IBM Corporation and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* IBM Corporation - initial API and implementation -*******************************************************************************/ -package org.eclipse.wst.wsi.tests.internal; - -import junit.framework.Test; -import junit.framework.TestSuite; -/** - * JUnit tests that runs all of the tests implemented - * in this plugin. - * - * @author lauzond - */ -public class RegressionBucket extends TestSuite { - - public static Test suite() - { - TestSuite suite= new TestSuite("Regression Bucket"); - suite.addTest(new TestSuite(WSDLConformanceSSBPTest.class)); - suite.addTest(new TestSuite(WSDLConformanceAPTest.class)); - - return suite; - } - -} diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java deleted file mode 100644 index 65103b4ee..000000000 --- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceAPTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (c) 2001, 2004 IBM Corporation and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* IBM Corporation - initial API and implementation -*******************************************************************************/ -package org.eclipse.wst.wsi.tests.internal; -/** - * JUnit tests that test wsdl documents against - * the WS-I Attachments profile. - * - * @author lauzond - */ -public class WSDLConformanceAPTest extends CoreWSDLConformanceTest -{ - public WSDLConformanceAPTest(String name) - { - super(name); - } -//ws-i wsdls - public void test_addressBook() { runTest("wsi", "addressBook", TAD_ID_AP); } - public void test_addressBook_rpc() { runTest("wsi", "addressBook-rpc", TAD_ID_AP); } - public void test_sampleAppCatalog() { runTest("wsi", "sampleAppCatalog", TAD_ID_AP); } - public void test_sampleAppManufacturer() { runTest("wsi", "sampleAppManufacturer", TAD_ID_AP); } - public void test_sampleAppWarehouse() { runTest("wsi", "sampleAppWarehouse", TAD_ID_AP); } - - // bp tests - public void test_2012_1() { runTest("bp", "2012-1", TAD_ID_AP); } - public void test_2013_1() { runTest("bp", "2013-1", TAD_ID_AP); } - public void test_2014_1() { runTest("bp", "2014-1", TAD_ID_AP); } - public void test_2014_2() { runTest("bp", "2014-2", TAD_ID_AP); } - public void test_2014_3() { runTest("bp", "2014-3", TAD_ID_AP); } - public void test_2017_1() { runTest("bp", "2017-1", TAD_ID_AP); } - public void test_2017_2() { runTest("bp", "2017-2", TAD_ID_AP); } - public void test_2018_1() { runTest("bp", "2018-1", TAD_ID_AP); } - public void test_2018_2() { runTest("bp", "2018-2", TAD_ID_AP); } - public void test_2018_3() { runTest("bp", "2018-3", TAD_ID_AP); } - public void test_2018_4() { runTest("bp", "2018-4", TAD_ID_AP); } - public void test_2019_1() { runTest("bp", "2019-1", TAD_ID_AP); } - public void test_2019_2() { runTest("bp", "2019-2", TAD_ID_AP); } - public void test_2019_3() { runTest("bp", "2019-3", TAD_ID_AP); } - public void test_2019_4() { runTest("bp", "2019-4", TAD_ID_AP); } - public void test_2020_1() { runTest("bp", "2020-1", TAD_ID_AP); } - public void test_2020_2() { runTest("bp", "2020-2", TAD_ID_AP); } - public void test_2105_1() { runTest("bp", "2105-1", TAD_ID_AP); } - public void test_2105_2() { runTest("bp", "2105-2", TAD_ID_AP); } - public void test_2117_1() { runTest("bp", "2117-1", TAD_ID_AP); } - public void test_2117_2() { runTest("bp", "2117-2", TAD_ID_AP); } - public void test_2117_3() { runTest("bp", "2117-3", TAD_ID_AP); } - public void test_2406_1() { runTest("bp", "2406-1", TAD_ID_AP); } - - // redundant tests -- assertions failures caught by base wsdl validator. - public void test_2010_1() { runTest("redundant", "2010-1", TAD_ID_AP); } - public void test_2011_1() { runTest("redundant", "2011-1", TAD_ID_AP); } - public void test_2011_2() { runTest("redundant", "2011-2", TAD_ID_AP); } - public void test_2011_3() { runTest("redundant", "2011-3", TAD_ID_AP); } - public void test_2011_4() { runTest("redundant", "2011-4", TAD_ID_AP); } - public void test_2011_5() { runTest("redundant", "2011-5", TAD_ID_AP); } - public void test_2021_1() { runTest("redundant", "2021-1", TAD_ID_AP); } - public void test_2021_2() { runTest("redundant", "2021-2", TAD_ID_AP); } - public void test_2021_3() { runTest("redundant", "2021-3", TAD_ID_AP); } - public void test_2021_4() { runTest("redundant", "2021-4", TAD_ID_AP); } - public void test_2021_5() { runTest("redundant", "2021-5", TAD_ID_AP); } - public void test_2021_6() { runTest("redundant", "2021-6", TAD_ID_AP); } - public void test_2022_1() { runTest("redundant", "2022-1", TAD_ID_AP); } - public void test_2022_2() { runTest("redundant", "2022-2", TAD_ID_AP); } - public void test_2032_1() { runTest("redundant", "2032-1", TAD_ID_AP); } - public void test_2032_2() { runTest("redundant", "2032-2", TAD_ID_AP); } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java deleted file mode 100644 index fd57606df..000000000 --- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSDLConformanceSSBPTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/* Copyright (c) 2001, 2004 IBM Corporation and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* IBM Corporation - initial API and implementation -*******************************************************************************/ -package org.eclipse.wst.wsi.tests.internal; -/** - * JUnit tests that test wsdl documents against - * the WS-I Simple Soap Binding profile. - * - * @author lauzond - */ -public class WSDLConformanceSSBPTest extends CoreWSDLConformanceTest -{ - public WSDLConformanceSSBPTest(String name) - { - super(name); - } - // ws-i wsdls - public void test_addressBook() { runTest("wsi", "addressBook", TAD_ID_SSBP); } - public void test_addressBook_rpc() { runTest("wsi", "addressBook-rpc", TAD_ID_SSBP); } - public void test_sampleAppCatalog() { runTest("wsi", "sampleAppCatalog", TAD_ID_SSBP); } - public void test_sampleAppManufacturer() { runTest("wsi", "sampleAppManufacturer", TAD_ID_SSBP); } - public void test_sampleAppWarehouse() { runTest("wsi", "sampleAppWarehouse", TAD_ID_SSBP); } - - // bp tests - public void test_2012_1() { runTest("bp", "2012-1", TAD_ID_SSBP); } - public void test_2013_1() { runTest("bp", "2013-1", TAD_ID_SSBP); } - public void test_2014_1() { runTest("bp", "2014-1", TAD_ID_SSBP); } - public void test_2014_2() { runTest("bp", "2014-2", TAD_ID_SSBP); } - public void test_2014_3() { runTest("bp", "2014-3", TAD_ID_SSBP); } - public void test_2017_1() { runTest("bp", "2017-1", TAD_ID_SSBP); } - public void test_2017_2() { runTest("bp", "2017-2", TAD_ID_SSBP); } - public void test_2018_1() { runTest("bp", "2018-1", TAD_ID_SSBP); } - public void test_2018_2() { runTest("bp", "2018-2", TAD_ID_SSBP); } - public void test_2018_3() { runTest("bp", "2018-3", TAD_ID_SSBP); } - public void test_2018_4() { runTest("bp", "2018-4", TAD_ID_SSBP); } - public void test_2019_1() { runTest("bp", "2019-1", TAD_ID_SSBP); } - public void test_2019_2() { runTest("bp", "2019-2", TAD_ID_SSBP); } - public void test_2019_3() { runTest("bp", "2019-3", TAD_ID_SSBP); } - public void test_2019_4() { runTest("bp", "2019-4", TAD_ID_SSBP); } - public void test_2020_1() { runTest("bp", "2020-1", TAD_ID_SSBP); } - public void test_2020_2() { runTest("bp", "2020-2", TAD_ID_SSBP); } - public void test_2105_1() { runTest("bp", "2105-1", TAD_ID_SSBP); } - public void test_2105_2() { runTest("bp", "2105-2", TAD_ID_SSBP); } - public void test_2117_1() { runTest("bp", "2117-1", TAD_ID_SSBP); } - public void test_2117_2() { runTest("bp", "2117-2", TAD_ID_SSBP); } - public void test_2117_3() { runTest("bp", "2117-3", TAD_ID_SSBP); } - public void test_2406_1() { runTest("bp", "2406-1", TAD_ID_SSBP); } - - // redundant tests -- assertions failures caught by base wsdl validator. - public void test_2010_1() { runTest("redundant", "2010-1", TAD_ID_SSBP); } - public void test_2011_1() { runTest("redundant", "2011-1", TAD_ID_SSBP); } - public void test_2011_2() { runTest("redundant", "2011-2", TAD_ID_SSBP); } - public void test_2011_3() { runTest("redundant", "2011-3", TAD_ID_SSBP); } - public void test_2011_4() { runTest("redundant", "2011-4", TAD_ID_SSBP); } - public void test_2011_5() { runTest("redundant", "2011-5", TAD_ID_SSBP); } - public void test_2021_1() { runTest("redundant", "2021-1", TAD_ID_SSBP); } - public void test_2021_2() { runTest("redundant", "2021-2", TAD_ID_SSBP); } - public void test_2021_3() { runTest("redundant", "2021-3", TAD_ID_SSBP); } - public void test_2021_4() { runTest("redundant", "2021-4", TAD_ID_SSBP); } - public void test_2021_5() { runTest("redundant", "2021-5", TAD_ID_SSBP); } - public void test_2021_6() { runTest("redundant", "2021-6", TAD_ID_SSBP); } - public void test_2022_1() { runTest("redundant", "2022-1", TAD_ID_SSBP); } - public void test_2022_2() { runTest("redundant", "2022-2", TAD_ID_SSBP); } - public void test_2032_1() { runTest("redundant", "2032-1", TAD_ID_SSBP); } - public void test_2032_2() { runTest("redundant", "2032-2", TAD_ID_SSBP); } - -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java b/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java deleted file mode 100644 index b0b975c03..000000000 --- a/tests/org.eclipse.wst.wsi.tests/src/org/eclipse/wst/wsi/tests/internal/WSITestsPlugin.java +++ /dev/null @@ -1,78 +0,0 @@ -/* Copyright (c) 2001, 2004 IBM Corporation and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* IBM Corporation - initial API and implementation -*******************************************************************************/ -package org.eclipse.wst.wsi.tests.internal; - -import java.io.IOException; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** -* The main plugin class to be used in the desktop. -*/ -public class WSITestsPlugin extends Plugin -{ - //The shared instance. - private static WSITestsPlugin plugin; - private static Bundle pluginBundle = null; - - /** - * The constructor. - */ - public WSITestsPlugin() - { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception - { - super.start(context); - pluginBundle = context.getBundle(); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception - { - super.stop(context); - } - - /** - * Returns the shared instance. - */ - public static WSITestsPlugin getDefault() - { - return plugin; - } - - /** - * Get the install URL of this plugin. - * - * @return the install url of this plugin - */ - public static String getInstallURL() - { - try - { - return Platform.resolve(pluginBundle.getEntry("/")).getFile(); - } - catch (IOException e) - { - return null; - } - } -} diff --git a/tests/org.eclipse.wst.wsi.tests/test.xml b/tests/org.eclipse.wst.wsi.tests/test.xml deleted file mode 100644 index 5be8ad94c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/test.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.." /> --> - - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.wsi.tests" /> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsi.tests.*xml" /> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="wst-folder" value="${eclipse-home}/wst_folder"/> - <delete dir="${wst-folder}" quiet="true"/> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${wst-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsi.tests.internal.RegressionBucket" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.wst.wsi.tests.*xml" /> - <property name="output-file" value="${plugin-name}.xml" /> - </ant> - </target> - -</project>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl deleted file mode 100644 index 0db92bfa3..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/2012-1.wsdl +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="Name" targetNamespace="http://tempuri.org/" xmlns:tns="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://tempuri.org/"> - <xsd:element name="Report"> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="tns:Name" /> - <xsd:element ref="tns:Specimen" /> - <xsd:element ref="tns:Lot" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="SampleList"> - <xsd:complexType> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="1" ref="tns:Report" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="Count" type="xsd:string" /> - <xsd:element name="LastModified" type="xsd:string" /> - <xsd:element name="Lot" type="xsd:string" /> - <xsd:element name="Name" type="xsd:string" /> - <xsd:element name="Number" type="xsd:string" /> - <xsd:element name="Specimen" type="xsd:string" /> - <xsd:element name="Sample"> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="tns:SampleName" /> - <xsd:element ref="tns:Count" /> - <xsd:element ref="tns:LastModified" /> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="tns:SampleProvider" /> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:string" use="optional" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="SampleName" type="xsd:string" /> - <xsd:element name="SampleProvider"> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="tns:Name" /> - <xsd:element ref="tns:Number" /> - <xsd:element ref="tns:SampleList" /> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:string" use="optional" /> - </xsd:complexType> - </xsd:element> - - - </xsd:schema> - </wsdl:types> - <wsdl:message name="getSampleRequest"> - <wsdl:part name="sampleId" type="xsd:string"></wsdl:part> - </wsdl:message> - <wsdl:message name="getSampleResponse"> - <wsdl:part name="report" element="tns:Sample"></wsdl:part> - </wsdl:message> - <wsdl:portType name="SamplePortType"> - <wsdl:operation name="getSample"> - <wsdl:input message="tns:getSampleRequest"></wsdl:input> - <wsdl:output message="tns:getSampleResponse"></wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SampleBinding" type="tns:SamplePortType"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="getSample"> - <soap:operation soapAction="http://tempuri.org/getSample" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SampleService"> - <wsdl:port name="SamplePort" binding="tns:SampleBinding"> - <soap:address location="http://tempuri.org/" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml deleted file mode 100644 index 119b7b08a..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-1/testcase.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2012-1"> - <description> - This is an example of a non-conformant wsdl that fails test assertion BP2012. - </description> - <expectedFailures> - <assertion id="BP2012" tadID="SSBP10"/> - <assertion id="BP2012" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl deleted file mode 100644 index 916108068..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/2012-2.wsdl +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="intf:PhoneNumber"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml deleted file mode 100644 index ee8ad5c0d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2012-2/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2012-2"> - <description> - This is an example of a non-conformant wsdl that fails test assertion BP2012. - - </description> - <expectedFailures> - <assertion id="BP2012" tadID="SSBP10"/> - <assertion id="BP2012" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl deleted file mode 100644 index a59124ef5..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/2013-1.wsdl +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml deleted file mode 100644 index 1c388d77a..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2013-1/testcase.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2013-1"> - <description> - This is an example of a conformant wsdl used in the WS-I - interoperability demo. - </description> - <expectedFailures> - <assertion id="BP2013" tadID="SSBP10"/> - <assertion id="BP2013" tadID="AP10"/> - <assertion id="BP2112" tadID="SSBP10"/> - <assertion id="BP2112" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl deleted file mode 100644 index b6002580e..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/2014-1.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - <part name="parameters1" type="s:string"/> - <part name="parameters2" type="s:string"/> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters parameters1 parameters2"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml deleted file mode 100644 index d6675f962..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-1/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2014-1"> - <description> - This is an example of a conformant wsdl containing a wsdl:operation - with a parameterOrder attribute. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl deleted file mode 100644 index 0653069b4..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/2014-2.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - <part name="parameters1" type="s:string"/> - <part name="parameters2" type="s:string"/> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters parameters1"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml deleted file mode 100644 index 755b404b6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-2/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2014-2"> - <description> - This is an example of a conformant wsdl containing a wsdl:operation - with a parameterOrder attribute. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl deleted file mode 100644 index abe792acc..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/2014-3.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - <part name="parameters1" type="s:string"/> - <part name="parameters2" type="s:string"/> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml deleted file mode 100644 index 3c72c7376..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2014-3/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2014-1"> - <description> - This is an example of a conformant wsdl containing a wsdl:operation - with a parameterOrder attribute. - </description> - <expectedFailures> - <assertion id="BP2014" tadID="SSBP10"/> - <assertion id="BP2014" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl deleted file mode 100644 index 76c5d756c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/2017-1.wsdl +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation style="document" soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation style="rpc" soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml deleted file mode 100644 index 65da9404a..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-1/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2017-1"> - <description> - This is an example of a non-conformant wsdl containing - multiple style values within the same binding. - </description> - <expectedFailures> - <assertion id="BP2017" tadID="SSBP10"/> - <assertion id="BP2017" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl deleted file mode 100644 index ab90ed5ce..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/2017-2.wsdl +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:portType name="AddressBook2"> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation style="document" soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:binding name="AddressBookSoapBinding2" type="intf:AddressBook2"> - <wsdlsoap:binding transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation style="rpc" soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml deleted file mode 100644 index d26e30bb7..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2017-2/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2017-2"> - <description> - This is an example of a conformant wsdl containing - multiple style values but in different bindings. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl deleted file mode 100644 index 4f2af9b67..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/2018-1.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <types/> - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml deleted file mode 100644 index b4f65368d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-1/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2018-1"> - <description> - This is an example of a conformant wsdl containing a documentation - element preceding the types element. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl deleted file mode 100644 index e47b96661..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018-2.wsdl +++ /dev/null @@ -1,45 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <import namespace="http://tempuri.org/2018a" location="2018a.wsdl"/> - <import namespace="http://tempuri.org/2018b" location="2018b.wsdl"/> - <types/> - - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl deleted file mode 100644 index 558d96ba5..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018a.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2018a" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2018a" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl deleted file mode 100644 index 7432ec41c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/2018b.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2018b" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2018b" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml deleted file mode 100644 index 666c545d2..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-2/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2018-1"> - <description> - This is an example of a conformant wsdl containing a documentation - element and 2 import elements preceding the types element. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl deleted file mode 100644 index 340d85b5b..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/2018-3.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <types/> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml deleted file mode 100644 index b53464f67..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-3/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2018-3"> - <description> - This is an example of a non conformant wsdl containing a message - element preceding the types element. - </description> - <expectedFailures> - <assertion id="BP2018" tadID="SSBP10"/> - <assertion id="BP2018" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl deleted file mode 100644 index b40589165..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018-4.wsdl +++ /dev/null @@ -1,44 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <import namespace="http://tempuri.org/2018a" location="2018a.wsdl"/> - <import namespace="http://tempuri.org/2018b" location="2018b.wsdl"/> - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <types/> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl deleted file mode 100644 index 558d96ba5..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018a.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2018a" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2018a" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl deleted file mode 100644 index 7432ec41c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/2018b.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2018b" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2018b" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml deleted file mode 100644 index 853591bf6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-4/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2018-4"> - <description> - This is an example of a non conformant wsdl containing a message - element preceding the types element. - </description> - <expectedFailures> - <assertion id="BP2018" tadID="SSBP10"/> - <assertion id="BP2018" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl deleted file mode 100644 index 81b9a6304..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018-5.wsdl +++ /dev/null @@ -1,13 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <import namespace="http://tempuri.org/2018a" location="2018a.wsdl"/> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl deleted file mode 100644 index adaf55ae5..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018a.wsdl +++ /dev/null @@ -1,43 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2018a" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2018a" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <import namespace="http://tempuri.org/2018b" location="2018b.wsdl"/> - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <types/> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl deleted file mode 100644 index 7432ec41c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/2018b.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2018b" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2018b" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml deleted file mode 100644 index 853591bf6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2018-5/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2018-4"> - <description> - This is an example of a non conformant wsdl containing a message - element preceding the types element. - </description> - <expectedFailures> - <assertion id="BP2018" tadID="SSBP10"/> - <assertion id="BP2018" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl deleted file mode 100644 index 40752df48..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/2019-1.wsdl +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal" namespace="http://tempuri.org/nowhere"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml deleted file mode 100644 index 8bad607b2..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-1/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2019-1"> - <description> - This is an example of a non conformant wsdl containing a document literal binding - wih a nampace attribute specified the soapbind:header element. - </description> - <expectedFailures> - <assertion id="BP2019" tadID="SSBP10"/> - <assertion id="BP2019" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl deleted file mode 100644 index ef200e2f6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/2019-2.wsdl +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/nowhere"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml deleted file mode 100644 index 5e9ae01f1..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-2/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2019-2"> - <description> - This is an example of a non conformant wsdl containing a document literal binding - wih a nampace attribute specified the soapbind:body element. - </description> - <expectedFailures> - <assertion id="BP2019" tadID="SSBP10"/> - <assertion id="BP2019" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl deleted file mode 100644 index 6a6399403..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/2019-3.wsdl +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1" namespace="http://tempuri.org/nowhere"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml deleted file mode 100644 index 53ec03db1..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-3/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2019-3"> - <description> - This is an example of a non conformant wsdl containing a document literal binding - wih a nampace attribute specified the soapbind:fault element. - </description> - <expectedFailures> - <assertion id="BP2019" tadID="SSBP10"/> - <assertion id="BP2019" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl deleted file mode 100644 index 78281e2ae..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/2019-4.wsdl +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal" namespace="http://tempuri.org/"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1" namespace="http://tempuri.org/nowhere"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml deleted file mode 100644 index 1949a53f3..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2019-4/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2019-4"> - <description> - This is an example of a non conformant wsdl containing a document literal binding - wih a nampace attribute specified the soapbind:headerfault element. - </description> - <expectedFailures> - <assertion id="BP2019" tadID="SSBP10"/> - <assertion id="BP2019" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl deleted file mode 100644 index 0290459ca..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/2020-1.wsdl +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml deleted file mode 100644 index 6bcccb3d6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-1/testcase.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2020-1"> - <description> - This is an example of a non conformant wsdl containing a rpc literal binding - wih a nampace attribute missing from a soapbind:body element. - </description> - <expectedFailures> - <assertion id="BP2020" tadID="SSBP10"/> - <assertion id="BP2020" tadID="AP10"/> - </expectedFailures> - -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl deleted file mode 100644 index 93ff63703..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/2020-2.wsdl +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="2020.xsd"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml deleted file mode 100644 index 09741808d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2020-2/testcase.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2020-2"> - <description> - This is an example of a non conformant wsdl containing a rpc literal binding - wih a nampace attribute specified in the soapbind:body element that has a - value that is not an absolute URI. - </description> - <expectedFailures> - <assertion id="BP2020" tadID="SSBP10"/> - <assertion id="BP2020" tadID="AP10"/> - </expectedFailures> - -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl deleted file mode 100644 index d4415cb49..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105-1.wsdl +++ /dev/null @@ -1,45 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <types/> - <import namespace="http://tempuri.org/2105a" location="2105a.wsdl"/> - <import namespace="http://tempuri.org/2105b" location="2105b.wsdl"/> - - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl deleted file mode 100644 index 831e79a53..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105a.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2105a" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2105a" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl deleted file mode 100644 index 27079b325..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/2105b.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2105b" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2105b" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml deleted file mode 100644 index 267fc0b61..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-1/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2105-1"> - <description> - This is an example of a non conformant wsdl containing a types - element preceding the 2 import elements. - </description> - <expectedFailures> - <assertion id="BP2105" tadID="SSBP10"/> - <assertion id="BP2105" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl deleted file mode 100644 index d41147f7c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105-2.wsdl +++ /dev/null @@ -1,45 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <documentation> - </documentation> - <import namespace="http://tempuri.org/2105a" location="2105a.wsdl"/> - <types/> - <import namespace="http://tempuri.org/2105b" location="2105b.wsdl"/> - - <message name="echoStringIn"> - <part name="parameters" type="s:string"/> - </message> - <message name="echoStringOut"> - <part name="parameters" type="s:string" /> - </message> - <portType name="EchoPortType"> - <operation name="echoString" parameterOrder="parameters"> - <input message="s0:echoStringIn" /> - <output message="s0:echoStringOut" /> - </operation> - </portType> - <binding name="EchoBinding" type="s0:EchoPortType"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <operation name="echoString"> - <soap:operation soapAction="http://tempuri.org/echoString" style="rpc" /> - <input> - <soap:body use="literal" namespace="htp://org.org"/> - </input> - <output> - <soap:body use="literal" namespace="htp://org.org" /> - </output> - </operation> - </binding> - <service name="EchoService"> - <port name="EchoPort" binding="s0:EchoBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl deleted file mode 100644 index 831e79a53..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105a.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2105a" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2105a" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl deleted file mode 100644 index 27079b325..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/2105b.wsdl +++ /dev/null @@ -1,10 +0,0 @@ -<definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:s="http://www.w3.org/2001/XMLSchema" - xmlns:s0="http://tempuri.org/2105b" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" - xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" - targetNamespace="http://tempuri.org/2105b" xmlns="http://schemas.xmlsoap.org/wsdl/"> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml deleted file mode 100644 index 9a599f920..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2105-2/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2105-2"> - <description> - This is an example of a non conformant wsdl containing a types - element between the 2 import elements. - </description> - <expectedFailures> - <assertion id="BP2105" tadID="SSBP10"/> - <assertion id="BP2105" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl deleted file mode 100644 index 6cb8fef79..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/2117-1.wsdl +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal" namespace="http://tempuri.org/"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml deleted file mode 100644 index 6137ac315..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-1/testcase.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2117-1"> - <description> - This is an example of a non conformant wsdl containing a rpc literal binding - wih a nampace attribute specified the soapbind:fault element. - </description> - <expectedFailures> - <assertion id="BP2117" tadID="SSBP10"/> - <assertion id="BP2117" tadID="AP10"/> - </expectedFailures> - -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl deleted file mode 100644 index 1f822a71d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/2117-2.wsdl +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" type="xsd:string" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1" namespace="http://tempuri.org/"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml deleted file mode 100644 index 11401e2c9..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-2/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2117-2"> - <description> - This is an example of a non conformant wsdl containing a rpc literal binding - wih a nampace attribute specified the soapbind:fault element. - </description> - <expectedFailures> - <assertion id="BP2117" tadID="SSBP10"/> - <assertion id="BP2117" tadID="AP10"/> - <assertion id="BP2113" tadID="SSBP10"/> - <assertion id="BP2113" tadID="AP10"/> - </expectedFailures> - -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl deleted file mode 100644 index 0288f6026..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/2117-3.wsdl +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" type="xsd:string" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal" namespace="http://tempuri.org/"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml deleted file mode 100644 index b7d072e90..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2117-3/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2117-3"> - <description> - This is an example of a non conformant wsdl containing a rpc literal binding - wih a nampace attribute specified the soapbind:headerfault element. - </description> - <expectedFailures> - <assertion id="BP2117" tadID="SSBP10"/> - <assertion id="BP2117" tadID="AP10"/> - <assertion id="BP2113" tadID="SSBP10"/> - <assertion id="BP2113" tadID="AP10"/> - </expectedFailures> - -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl deleted file mode 100644 index ae24860a1..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/2406-1.wsdl +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<definitions name="SampleService" targetNamespace="http://tempuri.org/" xmlns:tns="http://tempuri.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <message name="getSampleRequest"> - <part name="zipcode" type="xsd:string"/> - </message> - <message name="getSampleResponse"> - <part name="return" type="xsd:float"/> - </message> - <portType name="SamplePortType"> - <operation name="getSample"> - <input message="tns:getSampleRequest"/> - <output message="tns:getSampleResponse"/> - </operation> - </portType> - <binding name="SampleBinding" type="tns:SamplePortType"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="getSample"> - <soap:operation soapAction=""/> - <input> - <soap:body use="encoded" namespace="http://tempuri.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </input> - <output> - <soap:body use="encoded" namespace="http://tempuri.org/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> - </output> - </operation> - </binding> - <service name="SampleService"> - <documentation></documentation> - <port name="SamplePort" binding="tns:SampleBinding"> - <soap:address location="http://tempuri.org/"/> - </port> - </service> -</definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml deleted file mode 100644 index 73a287d0f..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bp/2406-1/testcase.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2406-1"> - <description> - This is an example of a non-conformant wsdl that fails test assertion BP2406. - </description> - <expectedFailures> - <assertion id="BP2406" tadID="SSBP10"/> - <assertion id="BP2406" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl deleted file mode 100644 index 402029653..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/bugzilla/emptySoapBody/emptySoapBody.wsdl +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:s0="http://tempuri.org/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://tempuri.org/" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <types> - <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/"> - <s:element name="echoString"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" maxOccurs="1" name="arg" type="s:string" /> - </s:sequence> - </s:complexType> - </s:element> - </s:schema> - </types> - <message name="setMessageRequest"> - <part name="parameters" element="s0:echoString" /> - </message> - <message name="setMessageResponse"/> - - <portType name="Service1Soap"> - <operation name="setMessage"> - <input message="s0:setMessageRequest" /> - <output message="s0:setMessageResponse" /> - </operation> - </portType> - - <binding name="Service1Soap" type="s0:Service1Soap"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> - <operation name="setMessage"> - <soap:operation soapAction="" style="document" /> - <input> - <soap:body use="literal" /> - </input> - <output> - <soap:body use="literal" /> - </output> - </operation> - </binding> - - <service name="Service1"> - <port name="Service1Soap" binding="s0:Service1Soap"> - <soap:address location="http://localhost/WSIService/Service1.asmx" /> - </port> - </service> -</definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl deleted file mode 100644 index 8b13da096..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/2010-1.wsdl +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:service name="AddressBookService"> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml deleted file mode 100644 index 359bafcd4..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2010-1/testcase.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2010-1"> - <description> - This is an example of a non-conformant wsdl that fails test assertion BP2010. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2010" tadID="SSBP10"/> - <assertion id="BP2010" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl deleted file mode 100644 index c4308cd74..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011-1.wsdl +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="2011.xsd" schemaLocation="2011.xsd"/> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:service name="AddressBookService"> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd deleted file mode 100644 index 8857f7cf6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/2011.xsd +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <schema elementFormDefault="qualified" - targetNamespace="2011.xsd" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:apachesoap="http://xml.apache.org/xml-soap" - xmlns:intf="2011-1.xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="next.xsd" schemaLocation="next.xsd"/> - </schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd deleted file mode 100644 index 1a684212d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/next.xsd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xs:schema - targetNamespace="next.xsd" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" - elementFormDefault="qualified"> - <xs:annotation> - <xs:documentation> - </xs:documentation> - </xs:annotation> -</xs:schema> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml deleted file mode 100644 index 1fb670c89..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-1/testcase.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2011-1"> - <description> - This is an example of a onformant wsdl. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl deleted file mode 100644 index c4308cd74..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011-2.wsdl +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="2011.xsd" schemaLocation="2011.xsd"/> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:service name="AddressBookService"> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd deleted file mode 100644 index 33216d741..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/2011.xsd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.1" encoding="UTF-8"?> - <schema elementFormDefault="qualified" - targetNamespace="2011.xsd" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:apachesoap="http://xml.apache.org/xml-soap" - xmlns:intf="2011-1.xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - </schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml deleted file mode 100644 index 0fb70d569..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-2/testcase.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2011-2"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2011. - However the prerequisite BP2102 fails before we actually can execute the test assertion. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2102" tadID="SSBP10"/> - <assertion id="BP2122" tadID="SSBP10"/> - <assertion id="BP2202" tadID="SSBP10"/> - <assertion id="BP2102" tadID="AP10"/> - <assertion id="BP2122" tadID="AP10"/> - <assertion id="BP2202" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl deleted file mode 100644 index c4308cd74..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011-3.wsdl +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="2011.xsd" schemaLocation="2011.xsd"/> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:service name="AddressBookService"> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd deleted file mode 100644 index 8857f7cf6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/2011.xsd +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <schema elementFormDefault="qualified" - targetNamespace="2011.xsd" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:apachesoap="http://xml.apache.org/xml-soap" - xmlns:intf="2011-1.xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="next.xsd" schemaLocation="next.xsd"/> - </schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd deleted file mode 100644 index 960a77f6b..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/next.xsd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.1" encoding="utf-8"?> -<xs:schema - targetNamespace="next.xsd" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" - elementFormDefault="qualified"> - <xs:annotation> - <xs:documentation> - </xs:documentation> - </xs:annotation> -</xs:schema> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml deleted file mode 100644 index 5fca1e425..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-3/testcase.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2011-3"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2011. - However the prerequisite BP2102 fails before we actually can execute the test assertion. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2102" tadID="SSBP10"/> - <assertion id="BP2122" tadID="SSBP10"/> - <assertion id="BP2202" tadID="SSBP10"/> - <assertion id="BP2102" tadID="AP10"/> - <assertion id="BP2122" tadID="AP10"/> - <assertion id="BP2202" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl deleted file mode 100644 index c4308cd74..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011-4.wsdl +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="2011.xsd" schemaLocation="2011.xsd"/> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:service name="AddressBookService"> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd deleted file mode 100644 index 12c87bf7f..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/2011.xsd +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <schema elementFormDefault="qualified" - targetNamespace="2011.xsd" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:apachesoap="http://xml.apache.org/xml-soap" - xmlns:intf="2011-1.xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <xs:annotation> - </schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml deleted file mode 100644 index 926b2a915..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-4/testcase.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2011-4"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2011. - However the prerequisite BP2102 fails before we actually can execute the test assertion. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2102" tadID="SSBP10"/> - <assertion id="BP2122" tadID="SSBP10"/> - <assertion id="BP2102" tadID="AP10"/> - <assertion id="BP2122" tadID="AP10"/> - </expectedFailures> - -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl deleted file mode 100644 index 3b4583753..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011-5.wsdl +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="2011-1.xsd" schemaLocation="2011-1.xsd"/> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:service name="AddressBookService"> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd deleted file mode 100644 index 8857f7cf6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/2011.xsd +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <schema elementFormDefault="qualified" - targetNamespace="2011.xsd" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:apachesoap="http://xml.apache.org/xml-soap" - xmlns:intf="2011-1.xsd" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <import namespace="next.xsd" schemaLocation="next.xsd"/> - </schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd deleted file mode 100644 index 543c45522..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/next.xsd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xs:schema - targetNamespace="next.xsd" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" - elementFormDefault="qualified"> - <xs:annotation> -</xs:schema> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml deleted file mode 100644 index a49cb2715..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2011-5/testcase.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2011-5"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2011. - However the prerequisite BP2102 fails before we actually can execute the test assertion. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2102" tadID="SSBP10"/> - <assertion id="BP2122" tadID="SSBP10"/> - <assertion id="BP2202" tadID="SSBP10"/> - <assertion id="BP2102" tadID="AP10"/> - <assertion id="BP2122" tadID="AP10"/> - <assertion id="BP2202" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl deleted file mode 100644 index 5d3684d7c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/2021-1.wsdl +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - <element name="Address" type="string"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:Address" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" parts="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml deleted file mode 100644 index 50667b47b..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-1/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2021-1"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2021. - Soapbind:header element uses parts attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2021" tadID="SSBP10"/> - <assertion id="BP2021" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl deleted file mode 100644 index 664f5238f..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/2021-2.wsdl +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - <element name="Address" type="string"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:Address" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml deleted file mode 100644 index 867b6afef..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-2/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2021-2"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2021. - Soapbind:header element does not have a part attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2021" tadID="SSBP10"/> - <assertion id="BP2021" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl deleted file mode 100644 index 1f7cedf49..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/2021-3.wsdl +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - <element name="Address" type="string"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:Address" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml deleted file mode 100644 index f9b015f7e..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-3/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2021-3"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2021. - Soapbind:headerfault element does not have a part attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2021" tadID="SSBP10"/> - <assertion id="BP2021" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl deleted file mode 100644 index d44ab7b9c..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/2021-4.wsdl +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" parts="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml deleted file mode 100644 index 8d5cc4314..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-4/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2021-4"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2021. - Soapbind:header element uses parts attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2021" tadID="SSBP10"/> - <assertion id="BP2021" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl deleted file mode 100644 index 7b5d7f35d..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/2021-5.wsdl +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml deleted file mode 100644 index f7c928cd2..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-5/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2021-5"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2021. - Soapbind:header element does not have a part attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2021" tadID="SSBP10"/> - <assertion id="BP2021" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl deleted file mode 100644 index 87a855360..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/2021-6.wsdl +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal" name="f1"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml deleted file mode 100644 index d7f15092f..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2021-6/testcase.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2021-6"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2021. - Soapbind:headerfault element does not have a part attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2021" tadID="SSBP10"/> - <assertion id="BP2021" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl deleted file mode 100644 index 0a380c0d9..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/2022-1.wsdl +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - <element name="Address" type="string"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:Address" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml deleted file mode 100644 index facc02c05..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-1/testcase.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2022-1"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2022. - Soapbind:fault element does not have a name attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2022" tadID="SSBP10"/> - <assertion id="BP2022" tadID="AP10"/> - <assertion id="BP2032" tadID="SSBP10"/> - <assertion id="BP2032" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl deleted file mode 100644 index c2de1df89..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/2022-2.wsdl +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault use="literal"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml deleted file mode 100644 index 0ba892a4a..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2022-2/testcase.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2022-2"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2022. - Soapbind:fault element does not have a name attribute. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2022" tadID="SSBP10"/> - <assertion id="BP2022" tadID="AP10"/> - <assertion id="BP2032" tadID="SSBP10"/> - <assertion id="BP2032" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl deleted file mode 100644 index aa2235e75..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/2032-1.wsdl +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - <element name="Address" type="string"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:Address" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault name="fault1" use="literal"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml deleted file mode 100644 index 218b32784..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-1/testcase.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2032-1"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2022. - The name attribute value on the Soapbind:fault element does not match the name - attribute value specified on the parent element wsdl:fault element. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2032" tadID="SSBP10"/> - <assertion id="BP2032" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl deleted file mode 100644 index 852fadfd6..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/2032-2.wsdl +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:message name="parameterfault"> - <part name="part3" element="intf:findAddress" /> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - <wsdl:fault name="f1" message="intf:parameterfault"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - <wsdlsoap:headerfault message="intf:findAddressRequest" part="AddressHeader" use="literal"/> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="f1"> - <wsdlsoap:fault name="fault1" use="literal"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml deleted file mode 100644 index dc3459392..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/redundant/2032-2/testcase.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="2032-2"> - <description> - This is an example of a non-conformant wsdl that should fail test assertion BP2022. - The name attribute value on the Soapbind:fault element does not match the name - attribute value specified on the parent element wsdl:fault element. - Note this assertion is caught by the base WSDL validator. - So this assertion should be disabled when running in conjunction with the - base validator. - </description> - <expectedFailures> - <assertion id="BP2032" tadID="SSBP10"/> - <assertion id="BP2032" tadID="AP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl deleted file mode 100644 index 6777c12c7..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/addressBook-rpc.wsdl +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <complexType name="findAddressResponse"> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddress"> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - <complexType name="saveAddressResponse"> - <sequence/> - </complexType> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" type="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" type="xsd:string"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" type="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" type="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal" namespace="http://tempuri.org/"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml deleted file mode 100644 index 15a2f8da2..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook-rpc/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="addressBook-rpc"> - <description> - This is an example of a conformant wsdl used in the WS-I - interoperability demo. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl deleted file mode 100644 index 01482d836..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/addressBook.wsdl +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:intf="http://tempuri.org/" xmlns:impl="http://tempuri.org/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:intf="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <element name="findAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <complexType name="Address"> - <sequence> - <element name="province" nillable="true" type="xsd:string"/> - <element name="city" nillable="true" type="xsd:string"/> - <element name="street" nillable="true" type="xsd:string"/> - <element name="postalCode" nillable="true" type="xsd:string"/> - <element name="phoneNumber" nillable="true" type="impl:PhoneNumber"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="area" type="xsd:int"/> - <element name="prefix" type="xsd:int"/> - <element name="number" type="xsd:int"/> - </sequence> - </complexType> - <element name="findAddressResponse"> - <complexType> - <sequence> - <element name="findAddressReturn" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddress"> - <complexType> - <sequence> - <element name="name" nillable="true" type="xsd:string"/> - <element name="address" nillable="true" type="impl:Address"/> - </sequence> - </complexType> - </element> - <element name="saveAddressResponse"> - <complexType> - <sequence/> - </complexType> - </element> - <complexType name="AddressHeaderType"> - <all> - <element name="a" type="int"/> - <element name="b" type="boolean"/> - <element name="s" nillable="true" type="string"/> - </all> - </complexType> - <element name="AddressHeader" nillable="true" type="impl:AddressHeaderType"/> - </schema> - </wsdl:types> - <wsdl:message name="saveAddressRequest"> - <wsdl:part name="parameters" element="intf:saveAddress"/> - </wsdl:message> - <wsdl:message name="findAddressRequest"> - <wsdl:part name="parameters" element="intf:findAddress"/> - <wsdl:part name="AddressHeader" element="intf:AddressHeader"/> - </wsdl:message> - <wsdl:message name="findAddressResponse"> - <wsdl:part name="parameters" element="intf:findAddressResponse"/> - </wsdl:message> - <wsdl:message name="saveAddressResponse"> - <wsdl:part name="parameters" element="intf:saveAddressResponse"/> - </wsdl:message> - <wsdl:portType name="AddressBook"> - <wsdl:operation name="findAddress"> - <wsdl:input name="findAddressRequest" message="intf:findAddressRequest"/> - <wsdl:output name="findAddressResponse" message="intf:findAddressResponse"/> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdl:input name="saveAddressRequest" message="intf:saveAddressRequest"/> - <wsdl:output name="saveAddressResponse" message="intf:saveAddressResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressBookSoapBinding" type="intf:AddressBook"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="findAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="findAddressRequest"> - <wsdlsoap:header message="intf:findAddressRequest" part="AddressHeader" use="literal"> - </wsdlsoap:header> - <wsdlsoap:body parts="parameters" use="literal"/> - </wsdl:input> - <wsdl:output name="findAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="saveAddress"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="saveAddressRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="saveAddressResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressBookService"> - <wsdl:port name="AddressBook" binding="intf:AddressBookSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/AddressBook"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml deleted file mode 100644 index e4c68a7f2..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/addressBook/testcase.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="addressBook"> - <description> - This is an example of a conformant wsdl used in the WS-I - interoperability demo. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl deleted file mode 100644 index 8dc297345..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/sampleAppCatalog.wsdl +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://tempuri.org/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:intf="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl" - xmlns:impl="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog_Impl.wsdl" - xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" - xmlns="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl" - location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2003-07/Catalog.wsdl"/> - <wsdl:service name="CatalogService"> - <wsdl:port name="Catalog" binding="intf:CatalogSoapBinding"> - <wsdlsoap:address location="http://tempuri.org/CatalogService"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml deleted file mode 100644 index 7c053a245..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppCatalog/testcase.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="sampleAppCatalog"> - <description> - This is the WS-I Sample Application demonstrating attachment support. - This should validate against the WS-I Attachments Profile. - However, this should fail to conform to the WS-I Simple Soap Binding Profile. - </description> - <expectedFailures> - <assertion id="SSBP2403" tadID="SSBP10"/> - </expectedFailures> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl deleted file mode 100644 index fed06795b..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/sampleAppManufacturer.wsdl +++ /dev/null @@ -1,26 +0,0 @@ -<wsdl:definitions - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:impl="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer_Impl.wsdl" - xmlns:intf="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" - xmlns:ct="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.xsd" - xmlns:cfg="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" - targetNamespace="http://tempuri.org/"> - - <wsdl:import location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" - namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl"/> - <wsdl:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl" - location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Configuration.wsdl"/> - - <wsdl:service name="TestService"> - <wsdl:port binding="intf:ManufacturerSoapBinding" name="TestPort"> - <wsdlsoap:address location="http://tempuri.org/TestService"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml deleted file mode 100644 index f5c9f0618..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppManufacturer/testcase.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="sampleAppManufacturer"> - <description> - This is the WS-I Sample Application exercising the Manufacturer wsdl - in the WS-I Basic Profile. - This should validate against the WS-I Simple Soap Binding Profile. - This should also validate against the WS-I Attachments Profile. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl deleted file mode 100644 index ebe0d22c4..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/sampleAppWarehouse.wsdl +++ /dev/null @@ -1,20 +0,0 @@ -<wsdl:definitions - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:intf="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl" - xmlns:man="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - targetNamespace="http://tempuri.org/"> - - <wsdl:import location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl" - namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-10/Manufacturer.wsdl"/> - <wsdl:import location="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl" - namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.wsdl"/> - - <wsdl:service name="TestService"> - <wsdl:port binding="intf:WarehouseSoapBinding" name="TestPort"> - <wsdlsoap:address location="http://tempuri.org/TestService"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml b/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml deleted file mode 100644 index bc0dc51f0..000000000 --- a/tests/org.eclipse.wst.wsi.tests/testResources/samples/wsdl/wsi/sampleAppWarehouse/testcase.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<testcase name="sampleAppWarehouse"> - <description> - This is the WS-I Sample Application exercising the Warehouse wsdl - in the WS-I Basic Profile. - This should validate against the WS-I Simple Soap Binding Profile. - This should also validate against the WS-I Attachments Profile. - </description> - <expectedFailures/> -</testcase>
\ No newline at end of file |