diff options
| author | kchong | 2007-01-12 18:55:33 +0000 |
|---|---|---|
| committer | kchong | 2007-01-12 18:55:33 +0000 |
| commit | 337d8255ad0b4c528213d0d553a6b5edfea4060d (patch) | |
| tree | 571cfe71ecf27a48b037ceabe348fde60a32c256 /tests/org.eclipse.wst.wsdl.validation.tests | |
| parent | 74f8acc1c9f88ced9e1ed674b71e33a2bed9a846 (diff) | |
| download | webtools.webservices-200701121858.tar.gz webtools.webservices-200701121858.tar.xz webtools.webservices-200701121858.zip | |
This commit was manufactured by cvs2svn to create tag 'v200701121858'.v200701121858
Diffstat (limited to 'tests/org.eclipse.wst.wsdl.validation.tests')
253 files changed, 0 insertions, 6385 deletions
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/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index bd20e568a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sun Apr 16 17:56:05 EDT 2006 -eclipse.preferences.version=1 -encoding/<project>=ISO-8859-1 diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 554fa2faa..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,62 +0,0 @@ -#Tue Apr 18 12:47:27 EDT 2006 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 9a56f5f51..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri Feb 17 14:23:59 EST 2006 -eclipse.preferences.version=1 -internal.default.compliance=default diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 4a66d5a15..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,13 +0,0 @@ -#Sun Apr 16 17:55:02 EDT 2006 -compilers.p.build=0 -compilers.p.deprecated=0 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=0 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=0 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.use-project=true -eclipse.preferences.version=1 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 b88265bae..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,29 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %_PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.wst.wsdl.validation.tests -Bundle-Version: 1.0.202 -Bundle-ClassPath: wsdlvalidatetests.jar -Bundle-Activator: org.eclipse.wst.wsdl.validation.tests.internal.WSDLValidatorTestsPlugin -Bundle-Vendor: %_PROVIDER_NAME -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, - org.apache.xerces, - org.eclipse.wst.validation, - org.eclipse.wst.xml.core, - org.eclipse.wst.common.uriresolver -Eclipse-LazyStart: true -Export-Package: org.eclipse.wst.wsdl.validation.internal.resolver;x-internal:=true, - org.eclipse.wst.wsdl.validation.internal.ui.ant;x-internal:=true, - org.eclipse.wst.wsdl.validation.internal.wsdl11.xsd;x-internal:=true, - org.eclipse.wst.wsdl.validation.internal.xml;x-internal:=true, - org.eclipse.wst.wsdl.validation.tests.internal;x-internal:=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 4ec598958..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/about.html +++ /dev/null @@ -1,34 +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"> - -<H3>About This Content</H3> - -<P>May 2, 2006</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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</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 -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> 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 5c0461bce..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -source.wsdlvalidatetests.jar = src/ -output.wsdlvalidatetests.jar = bin/ -bin.includes = wsdlvalidatetests.jar,\ - testresources/,\ - test.xml,\ - META-INF/,\ - about.html,\ - plugin.properties -src.includes = build.properties diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/plugin.properties b/tests/org.eclipse.wst.wsdl.validation.tests/plugin.properties deleted file mode 100644 index 1278e0599..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2006 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 -############################################################################### -!-- properties file for org.eclipse.wst.wsdl.validation.test -_PLUGIN_NAME = WSDL Validator Tests Plug-in -_PROVIDER_NAME = Eclipse.org
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorTest.java deleted file mode 100644 index 678486ce5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorTest.java +++ /dev/null @@ -1,252 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.eclipse; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.ResourceBundle; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.apache.xerces.util.XMLGrammarPoolImpl; -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.ValidationInfoImpl; -import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl; -import org.eclipse.wst.wsdl.validation.internal.util.MessageGenerator; -import org.eclipse.wst.wsdl.validation.tests.internal.WSDLValidatorTestsPlugin; -import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; - -/** - * Test the WSDL validation framework Validator. - */ -public class ValidatorTest extends TestCase -{ - ValidatorWrapper validator = new ValidatorWrapper(); - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(ValidatorTest.class); - } - - /** - * Test the validate method. Tests to be performed:<br/> - * 1. Test that validating a valid file from a URI or an input stream produces the same result.<br/> - * 2. Test that validating an invalid file from a URI or an input stream produces the same result. - */ - public void testValidate() - { - try - { - // Test that validating a valid file from a URI and an input stream produces the same result. - NestedValidatorContext context = new NestedValidatorContext(); - validator.setupValidation(context); - String PLUGIN_ABSOLUTE_PATH = WSDLValidatorTestsPlugin.getInstallURL(); - String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathValid.wsdl"; - ValidationReport report1 = validator.validate(uri, null, context); - validator.teardownValidation(context); - validator.setupValidation(context); - ValidationReport report2 = null; - InputStream is = null; - try - { - is = new URL(uri).openStream(); - report2 = validator.validate(uri, is, context); - } - catch(Exception e) - { - fail("A problem occurred while validating a valid file with an inputstream: " + e); - } - finally - { - if(is != null) - { - try - { - is.close(); - } - catch(IOException e) - { - // Do nothing. - } - } - } - validator.teardownValidation(context); - assertTrue("Validation using a URI did not product a valid validation result.", report1.isValid()); - assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length); - - // Test that validating an invalid file from a URI and an input stream produces the same result. - NestedValidatorContext context2 = new NestedValidatorContext(); - validator.setupValidation(context2); - uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathInvalid.wsdl"; - report1 = validator.validate(uri, null, context2); - validator.teardownValidation(context2); - validator.setupValidation(context2); - report2 = null; - is = null; - try - { - is = new URL(uri).openStream(); - report2 = validator.validate(uri, is, context2); - } - catch(Exception e) - { - fail("A problem occurred while validating an invalid file with an inputstream: " + e); - } - finally - { - if(is != null) - { - try - { - is.close(); - } - catch(IOException e) - { - // Do nothing. - } - } - } - validator.teardownValidation(context2); - assertFalse("Validation using a URI did not product an invalid validation result.", report1.isValid()); - assertEquals("Validation using URI and using inputstream of the same file produces different numbers of errors.", report1.getValidationMessages().length, report2.getValidationMessages().length); - } - catch(Exception e) - { - fail("Unable to locate plug-in location: " + e); - } - } - - /** - * Test the setupValidation method. - * 1. Test that after run for a context XML and XSD grammar pools exist for the context. - */ - public void testSetupValidation() - { - validator.getXMLGrammarPoolsMap().clear(); - validator.getXSDGrammarPoolsMap().clear(); - - NestedValidatorContext context = new NestedValidatorContext(); - assertNull("An XML grammar pool already exists for the context.", validator.getXMLGrammarPoolForContext(context)); - assertNull("An XSD grammar pool already exists for the context.", validator.getXSDGrammarPoolForContext(context)); - - validator.setupValidation(context); - - assertNotNull("An XML grammar pool does not exist after the setupValidation method is run.", validator.getXMLGrammarPoolForContext(context)); - assertNotNull("An XSD grammar pool does not exist after the setupValidation method is run.", validator.getXSDGrammarPoolForContext(context)); - - validator.getXMLGrammarPoolsMap().clear(); - validator.getXSDGrammarPoolsMap().clear(); - } - - /** - * Test the teardownValidation method. - * 1. Test that after run for a context XML and XSD grammar pools do not exist for the context. - */ - public void testTeardownValidation() - { - validator.getXMLGrammarPoolsMap().clear(); - validator.getXSDGrammarPoolsMap().clear(); - - NestedValidatorContext context = new NestedValidatorContext(); - validator.getXMLGrammarPoolsMap().put(context, new XMLGrammarPoolImpl()); - validator.getXSDGrammarPoolsMap().put(context, new InlineSchemaModelGrammarPoolImpl()); - - validator.teardownValidation(context); - - assertNull("An XML grammar pool exists after the teardownValidation method is run.", validator.getXMLGrammarPoolForContext(context)); - assertNull("An XSD grammar pool exists after the teardownValidation method is run.", validator.getXSDGrammarPoolForContext(context)); - - validator.getXMLGrammarPoolsMap().clear(); - validator.getXSDGrammarPoolsMap().clear(); - } - - /** - * Test converting a message. The contents of the message should be included in the - * new report. - * 1. Test that a regular message is added as is. - * 2. Test that a nested message is added as a nested message. - */ - public void testConvertMessage() - { - // 1. Test that a regular message is added as is. - ValidationMessageImpl message = new ValidationMessageImpl("message", 1, 2, IValidationMessage.SEV_ERROR, "file:/someuri"); - ValidationInfo report = new ValidationInfo("file:/someuri"); - validator.convertMessage(message, report); - assertEquals("The report does not have 1 message.", 1, report.getValidationMessages().length); - assertEquals("The message string is incorrect.", "message", report.getValidationMessages()[0].getMessage()); - assertEquals("The message line number is incorrect.", 1, report.getValidationMessages()[0].getLineNumber()); - assertEquals("The message column number is incorrect.", 2, report.getValidationMessages()[0].getColumnNumber()); - assertEquals("The message severity is incorrect.", ValidationMessage.SEV_NORMAL, report.getValidationMessages()[0].getSeverity()); - assertEquals("The message URI is incorrect.", "file:/someuri", report.getValidationMessages()[0].getUri()); - assertEquals("The message has an incorrectly registred nested message.", 0, report.getNestedMessages().size()); - - // 2. Test that a nested message is added as a nested message. - ValidationMessageImpl message2 = new ValidationMessageImpl("message", 1, 2, IValidationMessage.SEV_ERROR, "file:/someuri2"); - ValidationInfo report2 = new ValidationInfo("file:/someuri"); - validator.convertMessage(message2, report2); - assertEquals("The report with the nested message does not have 1 message.", 1, report2.getValidationMessages().length); - assertEquals("The container message URI is incorrect.", "file:/someuri2", report2.getValidationMessages()[0].getUri()); - assertEquals("The container message does not have 1 nested message.", 1, report2.getValidationMessages()[0].getNestedMessages().size()); - assertEquals("The nested message URI is incorrect.", "file:/someuri2", ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getUri()); - assertEquals("The nested message string is incorrect.", "message", ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getMessage()); - assertEquals("The nested message line number is incorrect.", 1, ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getLineNumber()); - assertEquals("The nested message column number is incorrect.", 2, ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getColumnNumber()); - assertEquals("The nested message severity is incorrect.", ValidationMessage.SEV_NORMAL, ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getSeverity()); - assertEquals("The message does not have a nested message.", 1, report2.getNestedMessages().size()); - } - - /** - * Test converting a WSDL validation report to a XML validation report. - * The contents of the messages should be included in the new report. - * 1. Test that a regular message is added as is. - * 2. Test that a nested message is added as a nested message. - */ - public void testConvertReportToXMLReport() - { - // 1. Test that a regular message is added as is. - ValidationInfoImpl wsdlreport = new ValidationInfoImpl("file:/someuri", new MessageGenerator(ResourceBundle.getBundle("org.eclipse.wst.wsdl.validation.internal.eclipse.validatewsdl"))); - wsdlreport.addError("message", 1, 2, "file:/someuri"); - ValidationReport report = validator.convertReportToXMLReport(wsdlreport); - assertEquals("The report does not have 1 message.", 1, report.getValidationMessages().length); - assertEquals("The message string is incorrect.", "message", report.getValidationMessages()[0].getMessage()); - assertEquals("The message line number is incorrect.", 1, report.getValidationMessages()[0].getLineNumber()); - assertEquals("The message column number is incorrect.", 2, report.getValidationMessages()[0].getColumnNumber()); - assertEquals("The message severity is incorrect.", ValidationMessage.SEV_NORMAL, report.getValidationMessages()[0].getSeverity()); - assertEquals("The message URI is incorrect.", "file:/someuri", report.getValidationMessages()[0].getUri()); - assertEquals("The message has an incorrectly registred nested message.", 0, report.getNestedMessages().size()); - - // 2. Test that a nested message is added as a nested message. - ValidationInfoImpl wsdlreport2 = new ValidationInfoImpl("file:/someuri", new MessageGenerator(ResourceBundle.getBundle("org.eclipse.wst.wsdl.validation.internal.eclipse.validatewsdl"))); - wsdlreport2.addError("message", 1, 2, "file:/someuri2"); - ValidationReport report2 = validator.convertReportToXMLReport(wsdlreport2); - assertEquals("The report does not have 1 message.", 1, report2.getValidationMessages().length); - assertEquals("The message URI is incorrect.", "file:/someuri2", report2.getValidationMessages()[0].getUri()); - assertEquals("The message does not have 1 nested message.", 1, report2.getValidationMessages()[0].getNestedMessages().size()); - assertEquals("The message URI is incorrect.", "file:/someuri2", ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getUri()); - assertEquals("The message string is incorrect.", "message", ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getMessage()); - assertEquals("The message line number is incorrect.", 1, ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getLineNumber()); - assertEquals("The message column number is incorrect.", 2, ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getColumnNumber()); - assertEquals("The message severity is incorrect.", ValidationMessage.SEV_NORMAL, ((ValidationMessage)report2.getValidationMessages()[0].getNestedMessages().get(0)).getSeverity()); - assertEquals("The message does not have a nested message.", 1, report2.getNestedMessages().size()); - } - -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorWrapper.java deleted file mode 100644 index 2cad38269..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/ValidatorWrapper.java +++ /dev/null @@ -1,117 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.eclipse; - -import java.util.HashMap; - -import org.apache.xerces.xni.grammars.XMLGrammarPool; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; - -/** - * This class extends validator to expose the protected methods - * for testing. - */ -public class ValidatorWrapper extends Validator -{ - /* (non-Javadoc) - * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage) - */ - public void addInfoToMessage(ValidationMessage validationMessage, IMessage message) - { - super.addInfoToMessage(validationMessage, message); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.xml.core.internal.validation.eclipse.Validator#setupValidation(org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext) - */ - public void setupValidation(NestedValidatorContext context) - { - super.setupValidation(context); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.eclipse.Validator#teardownValidation(org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext) - */ - public void teardownValidation(NestedValidatorContext context) - { - super.teardownValidation(context); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.eclipse.Validator#convertMessage(org.eclipse.wst.wsdl.validation.internal.IValidationMessage, org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo) - */ - public void convertMessage(IValidationMessage message, ValidationInfo convertedReport) - { - super.convertMessage(message, convertedReport); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.eclipse.Validator#convertReportToXMLReport(org.eclipse.wst.wsdl.validation.internal.IValidationReport) - */ - public ValidationReport convertReportToXMLReport(IValidationReport report) - { - return super.convertReportToXMLReport(report); - } - - /** - * Get the XML grammar pool defined for the given context. - * - * @param context - * The context to use to retrieve the XML grammar pool. - * @return - * The XML grammar pool associated with the context or null if none is associated. - */ - public XMLGrammarPool getXMLGrammarPoolForContext(NestedValidatorContext context) - { - return (XMLGrammarPool)xmlGrammarPools.get(context); - } - - /** - * Get the XSD grammar pool defined for the given context. - * - * @param context - * The context to use to retrieve the XSD grammar pool. - * @return - * The XSD grammar pool associated with the context or null if none is associated. - */ - public XMLGrammarPool getXSDGrammarPoolForContext(NestedValidatorContext context) - { - return (XMLGrammarPool)xsdGrammarPools.get(context); - } - - /** - * Expose the XML grammar pools HashMap for testing. - * - * @return - * The XML grammar pools HashMap. - */ - public HashMap getXMLGrammarPoolsMap() - { - return xmlGrammarPools; - } - - /** - * Expose the XSD grammar pools HashMap for testing. - * - * @return - * The XSD grammar pools HashMap. - */ - public HashMap getXSDGrammarPoolsMap() - { - return xsdGrammarPools; - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorTest.java deleted file mode 100644 index cd7b83ac8..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.eclipse; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Test the Eclipse specific WSDL validator. - */ -public class WSDLValidatorTest extends TestCase -{ - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(WSDLValidatorTest.class); - } - - /** - * Test to ensure the URI resolver is not null in the Eclipse - * specific XML validator. - */ - public void testURIResolverIsRegistered() - { - WSDLValidatorWrapper validator = new WSDLValidatorWrapper(); - assertNotNull("The URI resolver is null.", validator.getURIResolver()); - } - -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorWrapper.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorWrapper.java deleted file mode 100644 index f24234085..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/WSDLValidatorWrapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.eclipse; - -import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolver; - -/** - * Wrapper for the Eclipse WSDL validator class to allow for testing. - */ -public class WSDLValidatorWrapper extends WSDLValidator -{ - /** - * Constructor. - */ - public WSDLValidatorWrapper() - { - super(); - } - - /** - * Get the URI resolver registered on the WSDL validator. - * - * @return The URI resolver registered on the WSDL validator. - */ - public URIResolver getURIResolver() - { - return uriResolver; - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/validatewsdl.properties b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/validatewsdl.properties deleted file mode 100644 index 395651b03..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/eclipse/validatewsdl.properties +++ /dev/null @@ -1,2 +0,0 @@ -# Duplicate error message for testing -_REF_FILE_ERROR_MESSAGE = Referenced file contains errors ({0}).
\ No newline at end of file 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/AntLoggerTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTest.java deleted file mode 100644 index 4bbc75316..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTest.java +++ /dev/null @@ -1,187 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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 junit.framework.TestCase; - -import org.eclipse.wst.wsdl.validation.internal.logging.ILogger; - -/** - * Tests for the AntLogger. - */ -public class AntLoggerTest extends TestCase -{ - AntLoggerTestTask task = null; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - task = new AntLoggerTestTask(); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - protected void tearDown() throws Exception - { - task = null; - } - - /** - * Test that the log method: - * 1. logs errors correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogErrorWithThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_ERROR, new Throwable("THROWABLE")); - - assertTrue("Warnings were reported when only errors should have been reported.", task.getWarnings().isEmpty()); - assertTrue("Infos were reported when only errors should have been reported.", task.getInfos().isEmpty()); - assertTrue("Verboses were reported when only errors should have been reported.", task.getVerboses().isEmpty()); - assertEquals("2 errors were not reported.", 2, task.getErrors().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getErrors().get(0)); - assertEquals("The throwable was not THROWABLE.", "java.lang.Throwable: THROWABLE", task.getErrors().get(1)); - } - - /** - * Test that the log method: - * 1. logs warnings correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogWarningWithThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_WARNING, new Throwable("THROWABLE")); - - assertTrue("Errors were reported when only warnings should have been reported.", task.getErrors().isEmpty()); - assertTrue("Infos were reported when only warnings should have been reported.", task.getInfos().isEmpty()); - assertTrue("Verboses were reported when only errors should have been reported.", task.getVerboses().isEmpty()); - assertEquals("2 warnings were not reported.", 2, task.getWarnings().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getWarnings().get(0)); - assertEquals("The throwable was not THROWABLE.", "java.lang.Throwable: THROWABLE", task.getWarnings().get(1)); - } - - /** - * Test that the log method: - * 1. logs infos correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogInfoWithThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_INFO, new Throwable("THROWABLE")); - - assertTrue("Warnings were reported when only infos should have been reported.", task.getWarnings().isEmpty()); - assertTrue("Errors were reported when only infos should have been reported.", task.getErrors().isEmpty()); - assertTrue("Verboses were reported when only errors should have been reported.", task.getVerboses().isEmpty()); - assertEquals("2 infos were not reported.", 2, task.getInfos().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getInfos().get(0)); - assertEquals("The throwable was not THROWABLE.", "java.lang.Throwable: THROWABLE", task.getInfos().get(1)); - } - - /** - * Test that the log method: - * 1. logs verboses correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogVerboseWithThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_VERBOSE, new Throwable("THROWABLE")); - - assertTrue("Warnings were reported when only verboses should have been reported.", task.getWarnings().isEmpty()); - assertTrue("Errors were reported when only verboses should have been reported.", task.getErrors().isEmpty()); - assertTrue("Infos were reported when only verboses should have been reported.", task.getInfos().isEmpty()); - assertEquals("2 verboses were not reported.", 2, task.getVerboses().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getVerboses().get(0)); - assertEquals("The throwable was not THROWABLE.", "java.lang.Throwable: THROWABLE", task.getVerboses().get(1)); - } - - /** - * Test that the log method: - * 1. logs errors correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogErrorWithoutThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_ERROR); - - assertTrue("Warnings were reported when only errors should have been reported.", task.getWarnings().isEmpty()); - assertTrue("Infos were reported when only errors should have been reported.", task.getInfos().isEmpty()); - assertTrue("Verboses were reported when only errors should have been reported.", task.getVerboses().isEmpty()); - assertEquals("1 error was not reported.", 1, task.getErrors().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getErrors().get(0)); - } - - /** - * Test that the log method: - * 1. logs warnings correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogWarningWithoutThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_WARNING); - - assertTrue("Errors were reported when only warnings should have been reported.", task.getErrors().isEmpty()); - assertTrue("Infos were reported when only warnings should have been reported.", task.getInfos().isEmpty()); - assertTrue("Verboses were reported when only errors should have been reported.", task.getVerboses().isEmpty()); - assertEquals("1 error was not reported.", 1, task.getWarnings().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getWarnings().get(0)); - } - - /** - * Test that the log method: - * 1. logs infos correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogInfoWithoutThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_INFO); - - assertTrue("Warnings were reported when only infos should have been reported.", task.getWarnings().isEmpty()); - assertTrue("Errors were reported when only infos should have been reported.", task.getErrors().isEmpty()); - assertTrue("Verboses were reported when only errors should have been reported.", task.getVerboses().isEmpty()); - assertEquals("1 info was not reported.", 1, task.getInfos().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getInfos().get(0)); - } - - /** - * Test that the log method: - * 1. logs verboses correctly. - * 2. records the message correctly. - * 3. records the throwable correctly. - */ - public void testLogVerboseWithoutThrowable() - { - AntLogger logger = new AntLogger(task); - logger.log("MESSAGE", ILogger.SEV_VERBOSE); - - assertTrue("Warnings were reported when only verboses should have been reported.", task.getWarnings().isEmpty()); - assertTrue("Errors were reported when only verboses should have been reported.", task.getErrors().isEmpty()); - assertTrue("Infos were reported when only verboses should have been reported.", task.getInfos().isEmpty()); - assertEquals("1 verbose was not reported.", 1, task.getVerboses().size()); - assertEquals("The message was not MESSAGE.", "MESSAGE", task.getVerboses().get(0)); - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTestTask.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTestTask.java deleted file mode 100644 index 7c2247a53..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/ant/AntLoggerTestTask.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.ArrayList; -import java.util.List; - -import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; - -/** - * A dummy task that will allow testing of the and logger. - */ -public class AntLoggerTestTask extends Task -{ - protected List errors = new ArrayList(); - protected List warnings = new ArrayList(); - protected List infos = new ArrayList(); - protected List verboses = new ArrayList(); - - /* (non-Javadoc) - * @see org.apache.tools.ant.Task#log(java.lang.String, int) - */ - public void log(String msg, int msgLevel) - { - if(msgLevel == Project.MSG_ERR) - { - errors.add(msg); - } - else if(msgLevel == Project.MSG_WARN) - { - warnings.add(msg); - } - else if(msgLevel == Project.MSG_INFO) - { - infos.add(msg); - } - else if(msgLevel == Project.MSG_VERBOSE) - { - verboses.add(msg); - } - } - - /* (non-Javadoc) - * @see org.apache.tools.ant.Task#log(java.lang.String) - */ - public void log(String msg) - { - log(msg, Project.MSG_INFO); - } - - /** - * Get the errors that were logged. - * - * @return - * The errors that were logged. - */ - public List getErrors() - { - return errors; - } - - /** - * Get the warnings that were logged. - * - * @return - * The warnings that were logged. - */ - public List getWarnings() - { - return warnings; - } - - /** - * Get the infos that were logged. - * - * @return - * The infos that were logged. - */ - public List getInfos() - { - return infos; - } - - /** - * Get the verboses that were logged. - * - * @return - * The verboses that were logged. - */ - public List getVerboses() - { - return verboses; - } -} 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 8b31f2d5a..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() throws Exception - { - 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/ui/text/WSDLValidateTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTest.java deleted file mode 100644 index b6458f203..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTest.java +++ /dev/null @@ -1,221 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.text; - -import java.text.MessageFormat; -import java.util.List; - -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.ValidationMessageImpl; -import org.eclipse.wst.wsdl.validation.internal.ValidatorRegistry; -import org.eclipse.wst.wsdl.validation.internal.logging.ILogger; -import org.eclipse.wst.wsdl.validation.internal.logging.LoggerFactory; -import org.eclipse.wst.wsdl.validation.internal.logging.StandardLogger; -import org.eclipse.wst.wsdl.validation.tests.internal.BaseTestCase; - -public class WSDLValidateTest extends BaseTestCase -{ - WSDLValidateWrapper validate = null; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.setUp(); - validate = new WSDLValidateWrapper(); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - protected void tearDown() throws Exception - { - validate = null; - super.tearDown(); - } - - /** - * Test the validateFile method. - * 1. A valid file should report back that it's valid. - * 2. An invalid file should report back that it's invalid. - * 3. A file that can't be found should succeed and report that it's invalid. - */ - public void testValidateFile() - { - String validFile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHat^InPath/AngleHatInPathValid.wsdl"; - if(PLUGIN_ABSOLUTE_PATH.startsWith("/")) - { - validFile = "file://" + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHat^InPath/AngleHatInPathValid.wsdl"; - } - String invalidFile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl"; - if(PLUGIN_ABSOLUTE_PATH.startsWith("/")) - { - invalidFile = "file://" + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHat^InPath/AngleHatInPathInvalid.wsdl"; - } - String nonexistantFile = "nonexistantfile.wsdl"; - // 1. A valid file should report back that it's valid. - IValidationReport report = validate.validateFile(validFile); - assertFalse("Errors were reported for a valid file.", report.hasErrors()); - - // 2. An invalid file should report back that it's invalid. - IValidationReport report2 = validate.validateFile(invalidFile); - assertTrue("Errors were not reported for an invalid file.", report2.hasErrors()); - - // 3. A file that can't be found should succeed and report that it's invalid. - IValidationReport report3 = validate.validateFile(nonexistantFile); - assertTrue("Errors were not reported for a nonexistant file.", report3.hasErrors()); - } - - /** - * Test the validate method. - * 1. The method should succeed with one file specified. - * 2. The method should succeed and validate 2 files when 2 are specified. - * 3. The method should output verbose information for valid files when verbose is enabled. - */ - public void testValidate() - { - String validFile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHat^InPath/AngleHatInPathValid.wsdl"; - if(PLUGIN_ABSOLUTE_PATH.startsWith("/")) - { - validFile = "file://" + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHat^InPath/AngleHatInPathValid.wsdl"; - } - String validFile2 = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl"; - if(PLUGIN_ABSOLUTE_PATH.startsWith("/")) - { - validFile2 = "file://" + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "Paths/AngleHatInFilename/AngleHat^InFilenameValid.wsdl"; - } - ILogger currentLogger = LoggerFactory.getInstance().getLogger(); - WSDLValidateTestLogger logger = new WSDLValidateTestLogger(); - LoggerFactory.getInstance().setLogger(logger); - - // 1. The method should succeed with one file specified. - validate.getWSDLFiles().add(validFile); - validate.validate(); - assertEquals("Validating a single valid file failed.", MessageFormat.format(WSDLValidateTextUIMessages._UI_VALIDATION_SUMMARY, new Object[]{new Integer(1), new Integer(0)}), logger.getInfos().get(0)); - validate.getWSDLFiles().clear(); - logger.getInfos().clear(); - - // 2. The method should succeed and validate 2 files when 2 are specified. - validate.getWSDLFiles().add(validFile); - validate.getWSDLFiles().add(validFile2); - validate.validate(); - assertEquals("Validating two valid files failed.", MessageFormat.format(WSDLValidateTextUIMessages._UI_VALIDATION_SUMMARY, new Object[]{new Integer(2), new Integer(0)}), logger.getInfos().get(0)); - validate.getWSDLFiles().clear(); - logger.getInfos().clear(); - - // 3. The method should output verbose information for valid files when verbose is enabled. - validate.setVerbose(true); - validate.getWSDLFiles().add(validFile); - validate.validate(); - assertEquals("Validating a single valid file failed.", MessageFormat.format(WSDLValidateTextUIMessages._UI_FILE_VALID, new Object[]{validFile}), logger.getVerboses().get(0)); - assertEquals("Validating a single valid file failed.", MessageFormat.format(WSDLValidateTextUIMessages._UI_VALIDATION_SUMMARY, new Object[]{new Integer(1), new Integer(0)}), logger.getInfos().get(0)); - validate.getWSDLFiles().clear(); - validate.setVerbose(false); - logger.getInfos().clear(); - logger.getVerboses().clear(); - - LoggerFactory.getInstance().setLogger(currentLogger); - } - - /** - * Test the getMessages method. - * 1. The method should return a properly formatted string for a single error. - * 2. The method should return a properly formatted string for a single warning. - * 3. The method should return a properly fomatted string for 2 messages. - */ - public void testGetMessages() - { - IValidationMessage errorMessage = new ValidationMessageImpl("MESSAGE", 1, 2, IValidationMessage.SEV_ERROR, "URI"); - IValidationMessage warningMessage = new ValidationMessageImpl("MESSAGE", 1, 2, IValidationMessage.SEV_WARNING, "URI"); - // 1. The method should return a properly formatted string for a single error. - IValidationMessage[] errorMessages = new IValidationMessage[]{errorMessage}; - String message = validate.getMessages(errorMessages); - assertEquals("The error message was not correct.", WSDLValidateTextUIMessages._UI_ERROR_MARKER + " 1:2 MESSAGE", message); - - // 2. The method should return a properly formatted string for a single warning. - IValidationMessage[] warningMessages = new IValidationMessage[]{warningMessage}; - String message2 = validate.getMessages(warningMessages); - assertEquals("The warning message was not correct.", WSDLValidateTextUIMessages._UI_WARNING_MARKER + " 1:2 MESSAGE", message2); - - // 3. The method should return a properly fomatted string for 2 messages. - IValidationMessage[] twoMessages = new IValidationMessage[]{errorMessage, warningMessage}; - String message3 = validate.getMessages(twoMessages); - assertEquals("Two messages was not correct.", WSDLValidateTextUIMessages._UI_ERROR_MARKER + " 1:2 MESSAGE\n" + WSDLValidateTextUIMessages._UI_WARNING_MARKER + " 1:2 MESSAGE", message3); - } - - /** - * Test the parseArguments method. - * 1. -wsdl11v parsing succeeds and registers the validator with the WSDL validator. - * 2. -extv parsing succeeds and registers the validator with the WSDL validator. - * 3. Extension validator parsing where a param is omitted succeeds. - * 4. -logger parsing succeeds and sets the correct logger. - * 5. -D (property) parsing succeeds sets the property on the configuration. - * 6. -v, -verbose parsing succeeds and sets verbose correctly. - * 7. The specified WSDL files are read properly. - * - * Not currently tested: - * -schema - * -schemaDir - * -uriresolver - */ - public void testParseArguments() - { - // 1. -wsdl11v parsing succeeds and registers the validator with the WSDL validator. - String[] args1 = new String[]{WSDLValidateWrapper.PARAM_WSDL11VAL, "http://wsdl11validator", "org.eclipse.wst.wsdl.validation.internal.wsdl11.http.HTTPValidator"}; - validate.parseArguments(args1); - assertTrue("The WSDL 1.1 validator was not registered.", org.eclipse.wst.wsdl.validation.internal.wsdl11.ValidatorRegistry.getInstance().hasRegisteredValidator("http://wsdl11validator")); - - // 2. -extv parsing succeeds and registers the validator with the WSDL validator. - String[] args2 = new String[]{WSDLValidateWrapper.PARAM_EXTVAL, "http://extvalidator", "validatorclass"}; - validate.parseArguments(args2); - assertTrue("The WSDL extension validator was not registered.", ValidatorRegistry.getInstance().hasRegisteredValidator("http://extvalidator", ValidatorRegistry.EXT_VALIDATOR)); - - // 3. Extension validator parsing where a param is omitted succeeds. - String[] args3 = new String[]{WSDLValidateWrapper.PARAM_EXTVAL, "http://extvalidator2", "-dummyparam"}; - validate.parseArguments(args3); - assertFalse("The WSDL extension validator was registered without enough information.", ValidatorRegistry.getInstance().hasRegisteredValidator("http://extvalidator2", ValidatorRegistry.EXT_VALIDATOR)); - - // 4. -logger parsing succeeds and sets the correct logger. - ILogger currentLogger = LoggerFactory.getInstance().getLogger(); - String[] args4 = new String[]{WSDLValidateWrapper.PARAM_LOGGER, "org.eclipse.wst.wsdl.validation.internal.logging.StandardLogger"}; - validate.parseArguments(args4); - assertTrue("The registered logger is not a StandardLogger", LoggerFactory.getInstance().getLogger() instanceof StandardLogger); - assertFalse("The registered logger is the same as originally registered.", currentLogger.equals(LoggerFactory.getInstance().getLogger())); - LoggerFactory.getInstance().setLogger(currentLogger); - - // 5. -D (property) parsing succeeds sets the property on the configuration. - String[] args5 = new String[]{WSDLValidateWrapper.PARAM_PROPERTY + "SAMPLENAME=SAMPLEVALUE"}; - validate.parseArguments(args5); - assertEquals("The parameter was not set correctly.", "SAMPLEVALUE", validate.getConfiguration().getProperty("SAMPLENAME")); - - // 6. -v, -verbose parsing succeeds and sets verbose correctly. - String[] args6 = new String[]{WSDLValidateWrapper.PARAM_VERBOSE}; - validate.setVerbose(false); - validate.parseArguments(args6); - assertTrue("Verbose is not set to true.", validate.isVerbose()); - - String[] args6a = new String[]{WSDLValidateWrapper.PARAM_VERBOSE_SHORT}; - validate.setVerbose(false); - validate.parseArguments(args6a); - assertTrue("Verbose is not set to true.", validate.isVerbose()); - - // 7. The specified WSDL files are read properly. - String[] args7 = new String[]{"filename1.wsdl", "folder/filename2.wsdl", "folder\filename3.wsdl"}; - validate.parseArguments(args7); - List wsdlFiles = validate.getWSDLFiles(); - assertEquals("There were not 3 WSDL files listed to validate.", 3, wsdlFiles.size()); - assertTrue("The WSDL file list did not include filename1.wsdl", wsdlFiles.contains("filename1.wsdl")); - assertTrue("The WSDL file list did not include folder/filename2.wsdl", wsdlFiles.contains("folder/filename2.wsdl")); - assertTrue("The WSDL file list did not include folder\filename3.wsdl", wsdlFiles.contains("folder\filename3.wsdl")); - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTestLogger.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTestLogger.java deleted file mode 100644 index 1352a4baa..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateTestLogger.java +++ /dev/null @@ -1,103 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.text; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.wst.wsdl.validation.internal.logging.ILogger; - -/** - * A helper class for testing that allows access to the messages logged. - */ -public class WSDLValidateTestLogger implements ILogger { - - protected List errors = new ArrayList(); - protected List warnings = new ArrayList(); - protected List infos = new ArrayList(); - protected List verboses = new ArrayList(); - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.logging.ILogger#log(java.lang.String, int) - */ - public void log(String message, int severity) - { - if(severity == ILogger.SEV_ERROR) - { - errors.add(message); - } - else if(severity == ILogger.SEV_WARNING) - { - warnings.add(message); - } - else if(severity == ILogger.SEV_INFO) - { - infos.add(message); - } - else if(severity == ILogger.SEV_VERBOSE) - { - verboses.add(message); - } - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.logging.ILogger#log(java.lang.String, int, java.lang.Throwable) - */ - public void log(String message, int severity, Throwable throwable) - { - log(message, severity); - log(throwable.toString(), severity); - } - - /** - * Get the error list. - * - * @return - * The error list. - */ - public List getErrors() - { - return errors; - } - - /** - * Get the warning list. - * - * @return - * The warning list. - */ - public List getWarnings() - { - return warnings; - } - - /** - * Get the info list. - * - * @return - * The info list. - */ - public List getInfos() - { - return infos; - } - - /** - * Get the verbose list. - * - * @return - * The verbose list. - */ - public List getVerboses() - { - return verboses; - } -} diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateWrapper.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateWrapper.java deleted file mode 100644 index 80407bd5e..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/internal/ui/text/WSDLValidateWrapper.java +++ /dev/null @@ -1,113 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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.text; - -import java.util.List; - -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.WSDLValidationConfiguration; -import org.eclipse.wst.wsdl.validation.internal.WSDLValidator; - -/** - * A wrapper class of WSDLValidate that exposes internals for testing. - */ -public class WSDLValidateWrapper extends WSDLValidate -{ - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.ui.text.WSDLValidate#getMessages(org.eclipse.wst.wsdl.validation.internal.IValidationMessage[]) - */ - public String getMessages(IValidationMessage[] messages) - { - return super.getMessages(messages); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.ui.text.WSDLValidate#parseArguments(java.lang.String[]) - */ - public void parseArguments(String[] args) - { - super.parseArguments(args); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.ui.text.WSDLValidate#validate() - */ - public void validate() - { - super.validate(); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.validation.internal.ui.text.WSDLValidate#validateFile(java.lang.String) - */ - public IValidationReport validateFile(String filename) - { - return super.validateFile(filename); - } - - /** - * Get the internal WSDL validator. - * - * @return - * The internal WSDL validator. - */ - public WSDLValidator getWSDLValidator() - { - return wsdlValidator; - } - - /** - * Get the WSDL validation configuration. - * - * @return - * The WSDL validation configuration. - */ - public WSDLValidationConfiguration getConfiguration() - { - return configuration; - } - - /** - * Get the list of WSDL files to validate. - * - * @return - * The list of WSDL files to validate. - */ - public List getWSDLFiles() - { - return wsdlFiles; - } - - /** - * Returns true if verbose is on, false otherwise. - * - * @return - * True if verbose is on, false otherwise. - */ - public boolean isVerbose() - { - return verbose; - } - - /** - * Set whether reporting should be done in a verbose way. - * - * @param verbose - * If true reporting will be done in a verbose way, otherwise it will not. - */ - public void setVerbose(boolean verbose) - { - this.verbose = verbose; - } - -} 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 2e7a262b3..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() throws Exception - { - 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 f5350f86c..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/AllWSDLTests.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2006 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.eclipse.ValidatorTest; -import org.eclipse.wst.wsdl.validation.internal.resolver.URIResolverTest; -import org.eclipse.wst.wsdl.validation.internal.ui.ant.AntLoggerTest; -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(ValidatorTest.suite()); - //addTest(WSDLValidatorTest.suite()); - addTest(XSDTest.suite()); - addTest(WSDLTest.suite()); - addTest(PathsTest.suite()); - addTest(URIResolverTest.suite()); - addTest(WSDLValidateTest.suite()); - addTest(XMLCatalogTest.suite()); - addTest(InlineSchemaGeneratorTest.suite()); - addTestSuite(LineNumberAdjustmentsTest.class); - addTestSuite(AntLoggerTest.class); - addTestSuite(org.eclipse.wst.wsdl.validation.internal.ui.text.WSDLValidateTest.class); - } -}
\ 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 eff916f65..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/BaseTestCase.java +++ /dev/null @@ -1,282 +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.apache.xerces.util.XMLGrammarPoolImpl; -import org.apache.xerces.xni.grammars.XMLGrammarPool; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; -import org.eclipse.wst.wsdl.validation.internal.Constants; -import org.eclipse.wst.wsdl.validation.internal.IValidationMessage; -import org.eclipse.wst.wsdl.validation.internal.IValidationReport; -import org.eclipse.wst.wsdl.validation.internal.WSDLValidationConfiguration; -import org.eclipse.wst.wsdl.validation.internal.eclipse.InlineSchemaModelGrammarPoolImpl; -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(); - - WSDLValidationConfiguration configuration = null; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.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); - - configuration = new WSDLValidationConfiguration(); - XMLGrammarPool xsdGrammarPool = new InlineSchemaModelGrammarPoolImpl(); - XMLGrammarPool xmlGrammarPool = new XMLGrammarPoolImpl(); - configuration.setProperty(Constants.XMLSCHEMA_CACHE_ATTRIBUTE, xsdGrammarPool); - configuration.setProperty(Constants.XML_CACHE_ATTRIBUTE, xmlGrammarPool); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ - protected void tearDown() throws Exception - { - configuration = null; - - super.tearDown(); - } - -/** - * 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, null, configuration); - 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/LineNumberAdjustmentsTest.java b/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/LineNumberAdjustmentsTest.java deleted file mode 100644 index 0c2953429..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/LineNumberAdjustmentsTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 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; - -/** - * Tests for line number adjustments in the WSDL validator's - * XML validator. - */ -public class LineNumberAdjustmentsTest extends BaseTestCase -{ - private String LINE_NUMBER_ADJUSTMENTS_DIR = "LineNumberAdjustments/"; - - /** - * Test /LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl - */ - public void testcvccomplextype23() - { - String testname = "cvc-complex-type.2.3"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.3/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.3/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.3/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl - */ - public void testcvccomplextype24b() - { - String testname = "cvc-complex-type.2.4.b"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.4.b/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.4.b/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "cvc-complex-type.2.4.b/" + 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/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 4f17bfaa1..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() throws Exception - { - 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 13ac8767f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/WSDLTest.java +++ /dev/null @@ -1,628 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2006 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() throws Exception - { - 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); - } - - /** - * Test /WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl - */ - public void testImportWithIncorrectSlash() - { - String testname = "ImportWithIncorrectSlash"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/ImportWithIncorrectSlash/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/ImportWithIncorrectSlash/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/ImportWithIncorrectSlash/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl - */ - public void testNoSchemeSchemaNamespaceImport() - { - String testname = "NoSchemeSchemaNamespaceImport"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "Import/NoSchemeSchemaNamespaceImport/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "Import/NoSchemeSchemaNamespaceImport/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "Import/NoSchemeSchemaNamespaceImport/" + 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); - } - - /** - * Test /WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl - */ - public void testCaseInsensitiveOperationNames() - { - String testname = "CaseInsensitiveOperationNames"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "CaseInsensitiveOperationNames/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "CaseInsensitiveOperationNames/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "CaseInsensitiveOperationNames/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl - */ - public void testNamespaceDoesntResolve() - { - String testname = "NamespaceDoesntResolve"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "NamespaceDoesntResolve/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "NamespaceDoesntResolve/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "NamespaceDoesntResolve/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl - */ - public void testNamespaceResolvesHTML() - { - String testname = "NamespaceResolvesHTML"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "NamespaceResolvesHTML/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "NamespaceResolvesHTML/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "NamespaceResolvesHTML/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfImport/SimpleFile/SelfImport.wsdl - */ - public void testSimplefileSelfImport() - { - String testname = "SelfImport"; - String fileprefix = FILE_PROTOCOL; - // Need to ensure the URL of the test file is as expected. - if(PLUGIN_ABSOLUTE_PATH.startsWith("/")) - { - fileprefix = fileprefix.substring(0, fileprefix.length()-1); - } - String testfile = fileprefix + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfImport/SimpleFile/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfImport/SimpleFile/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfImport/SimpleFile/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl - */ - public void testImportFileWithSelfImport() - { - String testname = "ImportFileWithSelfImport"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfImport/ImportFileWithSelfImport/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfImport/ImportFileWithSelfImport/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfImport/ImportFileWithSelfImport/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/SelfImport/SimpleFileInvalid/SelfImport.wsdl - */ - public void testSimpleFileInvalidSelfImport() - { - String testname = "SelfImport"; - String fileprefix = FILE_PROTOCOL; - // Need to ensure the URL of the test file is as expected. - if(PLUGIN_ABSOLUTE_PATH.startsWith("/")) - { - fileprefix = fileprefix.substring(0, fileprefix.length()-1); - } - String testfile = fileprefix + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "SelfImport/SimpleFileInvalid/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "SelfImport/SimpleFileInvalid/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "SelfImport/SimpleFileInvalid/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl - */ - public void testInvalidSchemaWithPartReferences() - { - String testname = "InvalidSchemaWithPartReferences"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + WSDL_DIR + "InvalidSchemaWithPartReferences/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + WSDL_DIR + "InvalidSchemaWithPartReferences/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + WSDL_DIR + "InvalidSchemaWithPartReferences/" + 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 251eaede5..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, 2006 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.FileLocator; -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 FileLocator.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 54c8d58bb..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/src/org/eclipse/wst/wsdl/validation/tests/internal/XSDTest.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.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() throws Exception - { - 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/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl - */ - public void testReferToAnotherInlineTypeNoImport() - { - String testname = "ReferToAnotherInlineTypeNoImport"; - 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); - } - - /** - * Test /XSD/ImportNoNSSchema/ImportNoNSSchema.wsdl - */ - public void testImportNoNSSchema() - { - String testname = "ImportNoNSSchema"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ImportNoNSSchema/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ImportNoNSSchema/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ImportNoNSSchema/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/ImportNoNSSchemAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl - */ - public void testImportNoNSSchemaAndSecondSchemaWithNS() - { - String testname = "ImportNoNSSchemaAndSecondSchemaWithNS"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "ImportNoNSSchemaAndSecondSchemaWithNS/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "ImportNoNSSchemaAndSecondSchemaWithNS/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "ImportNoNSSchemaAndSecondSchemaWithNS/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/NoNSElementReference/NoNSElementReference.wsdl - */ - public void testNoNSElementReference() - { - String testname = "NoNSElementReference"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "NoNSElementReference/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "NoNSElementReference/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "NoNSElementReference/" + testname + ".wsdl-log"; - - runTest(testfile, loglocation, idealloglocation); - } - - /** - * Test /XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl - */ - public void testInlineSchemaNoNamespace() - { - String testname = "InlineSchemaNoNamespace"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_DIR + "InlineSchemaNoNamespace/" + testname + ".wsdl"; - String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XSD_DIR + "InlineSchemaNoNamespace/" + testname + ".wsdl-log"; - String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XSD_DIR + "InlineSchemaNoNamespace/" + 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/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl-log deleted file mode 100644 index 92983cec1..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -cvc-complex-type.2.3: Element 'wsdl:operation' cannot have character [children], because the type's content type is element-only. [16, 37] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl-log deleted file mode 100644 index 173906785..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl-log +++ /dev/null @@ -1,8 +0,0 @@ -number of errors : 1 -number of warnings : 0 - -------------error list------------------------------------------- -cvc-complex-type.2.4.b: The content of element 'wsdl:operation' is not complete. One of '{"http://schemas.xmlsoap.org/wsdl/":documentation, WC[##other:"http://schemas.xmlsoap.org/wsdl/"], "http://schemas.xmlsoap.org/wsdl/":input, "http://schemas.xmlsoap.org/wsdl/":output}' is expected. [16, 37] -------------warning list----------------------------------------- -(none) ------------------------------------------------------------------ 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/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.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/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/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.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/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 cc8682ef3..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/ImportXMLInvalidWSDL/ImportXMLInvalidWSDL.wsdl-log +++ /dev/null @@ -1,9 +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] -------------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/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.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/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl-log deleted file mode 100644 index bef9908b9..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.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:strin'. It was detected that 'xsd:strin' is in namespace 'http://www.w3.org/2001/XMLSchema', but components from this namespace are not referenceable from schema document 'testresources/samples/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl'. If this is the incorrect namespace, perhaps the prefix of 'xsd:strin' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'testresources/samples/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl'. [16, 47] -------------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/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.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/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.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/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/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.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/SelfImport/SimpleFile/SelfImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/SimpleFile/SelfImport.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/SimpleFile/SelfImport.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/SelfImport/SimpleFileInvalid/SelfImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/SimpleFileInvalid/SelfImport.wsdl-log deleted file mode 100644 index 3e53490dd..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/WSDL/SelfImport/SimpleFileInvalid/SelfImport.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. [14, 70] -------------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/ImportNoNSSchema/ImportNoNSSchema.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportNoNSSchema/ImportNoNSSchema.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportNoNSSchema/ImportNoNSSchema.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/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.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/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.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/NoNSElementReference/NoNSElementReference.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/NoNSElementReference/NoNSElementReference.wsdl-log deleted file mode 100644 index aa2b36149..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/NoNSElementReference/NoNSElementReference.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/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl-log b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl-log deleted file mode 100644 index ea8818836..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/idealResults/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl-log +++ /dev/null @@ -1,9 +0,0 @@ -number of errors : 2 -number of warnings : 0 - -------------error list------------------------------------------- -src-resolve.4.2: Error resolving component 'two:NewSimpleType'. It was detected that 'two:NewSimpleType' is in namespace 'http://tempuri.org/ReferToAnotherInlineType2/', but components from this namespace are not referenceable from schema document 'testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl'. If this is the incorrect namespace, perhaps the prefix of 'two:NewSimpleType' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl'. [13, 67] -src-resolve.4.2: Error resolving component 'one:NewSimpleType'. It was detected that 'one:NewSimpleType' is in namespace 'http://tempuri.org/ReferToAnotherInlineType1/', but components from this namespace are not referenceable from schema document 'testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl'. If this is the incorrect namespace, perhaps the prefix of 'one:NewSimpleType' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl'. [24, 67] -------------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/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl deleted file mode 100644 index 89be321f5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.wsdl +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/cvc-complex-type.2.3/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="cvc-complex-type.2.3" targetNamespace="http://www.example.org/cvc-complex-type.2.3/"> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/cvc-complex-type.2.3/"> -<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="NewWSDLFile1"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="NewMessage"></wsdl:input> -aaaa -</wsdl:operation> -</wsdl:portType> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl deleted file mode 100644 index a19c51699..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.wsdl +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/cvc-complex-type.2.4.b/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="cvc-complex-type.2.4.b" targetNamespace="http://www.example.org/cvc-complex-type.2.4.b/"> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/cvc-complex-type.2.4.b/"> -<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="NewWSDLFile1"> -<wsdl:operation name="NewOperation"> -</wsdl:operation> -</wsdl:portType> -</wsdl:definitions> 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/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl deleted file mode 100644 index 58e1c8dc9..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/CaseInsensitiveOperationNames/CaseInsensitiveOperationNames.wsdl +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="CaseInsensitiveOperations" targetNamespace="http://www.example.org/CaseInsensitiveOperations/" xmlns:tns="http://www.example.org/CaseInsensitiveOperations/" 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/CaseInsensitiveOperations/"> - <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="CaseInsensitiveOperations"> - <wsdl:operation name="Operation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - <wsdl:operation name="operation"> - <wsdl:input message="tns:NewOperationRequest"/> - <wsdl:output message="tns:NewOperationResponse"/> - </wsdl:operation> - </wsdl:portType> -</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/ImportWithIncorrectSlash/B.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/B.xsd deleted file mode 100644 index b45007ec3..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/B.xsd +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://B"> - <xsd:import namespace="http://AC" schemaLocation=".\C.xsd"/> -</xsd:schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/C.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/C.xsd deleted file mode 100644 index f6df675d2..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/C.xsd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC"> - <xsd:complexType name="SampleType"> - <xsd:sequence> - <xsd:element name="SampleElement" nillable="true" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> -</xsd:schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl deleted file mode 100644 index b17c107c0..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/ImportWithIncorrectSlash/ImportWithIncorrectSlash.wsdl +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/NewWSDLFile/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NewWSDLFile" targetNamespace="http://tempuri.org/NewWSDLFile/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC"> - <xsd:include schemaLocation="C.xsd"/> - <xsd:import namespace="http://B" schemaLocation="B.xsd"/> - </xsd:schema> - </wsdl:types> -</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/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl deleted file mode 100644 index 78b165eed..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/Import/NoSchemeSchemaNamespaceImport/NoSchemeSchemaNamespaceImport.wsdl +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="www.example.org/NoSchemaSchemaNamespaceImport/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="NoSchemaSchemaNamespaceImport" - targetNamespace="www.example.org/NoSchemaSchemaNamespaceImport/" - xmlns:elms="common.elements"> - <wsdl:types> - <schema - targetNamespace="common.elements" - xmlns="http://www.w3.org/2001/XMLSchema"> - <complexType name="MyType"> - <sequence> - <element name="MyElement" type="xsd:string" /> - </sequence> - </complexType> - </schema> - <schema - targetNamespace="www.example.org/NoSchemaSchemaNamespaceImport/" - xmlns="http://www.w3.org/2001/XMLSchema"> - <xsd:import namespace="common.elements"/> - <element name="NewOperationResponse" type="elms:MyType" /> - <element name="NewOperationRequest" type="xsd:string" /> - </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: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/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl deleted file mode 100644 index aadc1544f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/InvalidSchemaWithPartReferences/InvalidSchemaWithPartReferences.wsdl +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="Foo" - targetNamespace="http://www.example.org/Foo/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="http://www.example.org/Foo/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <wsdl:types> - <xsd:schema targetNamespace="http://www.example.org/Foo/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="a" type="xsd:string" /> - <xsd:element name="b" type="xsd:string" /> - <xsd:element name="junk"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="y" type="xsd:strin"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:schema> - </wsdl:types> - <wsdl:message name="foo"> - <wsdl:part element="tns:a" name="foo" /> - </wsdl:message> - <wsdl:message name="bar"> - <wsdl:part element="tns:b" name="bar" /> - </wsdl:message> - <wsdl:portType name="Foo"> - <wsdl:operation name="getFoo"> - <wsdl:input message="tns:bar" /> - <wsdl:output message="tns:foo" /> - </wsdl:operation> - </wsdl:portType> -</wsdl:definitions> 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/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl deleted file mode 100644 index c9e74c573..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/NamespaceDoesntResolve/NamespaceDoesntResolve.wsdl +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/NamespaceDoesntResolve/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NamespaceDoesntResolve" targetNamespace="http://www.example.org/NamespaceDoesntResolve/"> -<wsdl:documentation> - This WSDL document tests that an element specified for a different namespace - that does not resolve to any resource validates correctly. -</wsdl:documentation> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/NamespaceDoesntResolve/"> -<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="NamespaceDoesntResolve"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -<wsdl:binding name="NamespaceDoesntResolveSOAP" type="tns:NamespaceDoesntResolve"> -<ext:element xmlns:ext="http://schemas.nonexistantdomain.ned/element"/> -<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> -<wsdl:operation name="NewOperation"> -<soap:operation soapAction="http://www.example.org/NamespaceDoesntResolve/NewOperation"/> -<wsdl:input> -<soap:body parts=" NewOperationRequest" use="literal"/> -</wsdl:input> -<wsdl:output> -<soap:body parts=" NewOperationResponse" use="literal"/> -</wsdl:output> -</wsdl:operation> -</wsdl:binding> -<wsdl:service name="NamespaceDoesntResolve"> -<wsdl:port binding="tns:NamespaceDoesntResolveSOAP" name="NamespaceDoesntResolveSOAP"> -<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/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl deleted file mode 100644 index 302f3a168..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/NamespaceResolvesHTML/NamespaceResolvesHTML.wsdl +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/NamespaceResolvesHTML/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NamespaceResolvesHTML" targetNamespace="http://www.example.org/NamespaceResolvesHTML/"> -<wsdl:documentation> - This WSDL tests that an extension element in a different namespace that - resolves to an HTML document (non-schema document) does not cause - validation errors. -</wsdl:documentation> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/NamespaceResolvesHTML/"> -<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="NamespaceResolvesHTML"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -<wsdl:binding name="NamespaceResolvesHTMLSOAP" type="tns:NamespaceResolvesHTML"> -<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> -<ext:element xmlns:ext="http://www.eclipse.org/webtools"/> -<wsdl:operation name="NewOperation"> -<soap:operation soapAction="http://www.example.org/NamespaceResolvesHTML/NewOperation"/> -<wsdl:input> -<soap:body parts=" NewOperationRequest" use="literal"/> -</wsdl:input> -<wsdl:output> -<soap:body parts=" NewOperationResponse" use="literal"/> -</wsdl:output> -</wsdl:operation> -</wsdl:binding> -<wsdl:service name="NamespaceResolvesHTML"> -<wsdl:port binding="tns:NamespaceResolvesHTMLSOAP" name="NamespaceResolvesHTMLSOAP"> -<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/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl deleted file mode 100644 index 59979f363..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/ImportFileWithSelfImport/ImportFileWithSelfImport.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Imports a file that contains a self import. ---> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportFileWithSelfImport/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportFileWithSelfImport" targetNamespace="http://www.example.org/ImportFileWithSelfImport/"> -<wsdl:import namespace="http://www.example.org/SelfImport/" location="SelfImport.wsdl"></wsdl:import> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/ImportFileWithSelfImport/"> -<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="ImportFileWithSelfImport"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -<wsdl:binding name="ImportFileWithSelfImportSOAP" type="tns:ImportFileWithSelfImport"> -<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> -<wsdl:operation name="NewOperation"> -<soap:operation soapAction="http://www.example.org/ImportFileWithSelfImport/NewOperation"/> -<wsdl:input> -<soap:body parts=" NewOperationRequest" use="literal"/> -</wsdl:input> -<wsdl:output> -<soap:body parts=" NewOperationResponse" use="literal"/> -</wsdl:output> -</wsdl:operation> -</wsdl:binding> -<wsdl:service name="ImportFileWithSelfImport"> -<wsdl:port binding="tns:ImportFileWithSelfImportSOAP" name="ImportFileWithSelfImportSOAP"> -<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/SelfImport/ImportFileWithSelfImport/SelfImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/ImportFileWithSelfImport/SelfImport.wsdl deleted file mode 100644 index 7891d3532..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/ImportFileWithSelfImport/SelfImport.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - A WSDL document with a self import. ---> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/SelfImport/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SelfImport" targetNamespace="http://www.example.org/SelfImport/"> -<wsdl:import namespace="http://www.example.org/SelfImport/" location="SelfImport.wsdl"></wsdl:import> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/SelfImport/"> -<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="SelfImport"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -<wsdl:binding name="SelfImportSOAP" type="tns:SelfImport"> -<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> -<wsdl:operation name="NewOperation"> -<soap:operation soapAction="http://www.example.org/SelfImport/NewOperation"/> -<wsdl:input> -<soap:body parts=" NewOperationRequest" use="literal"/> -</wsdl:input> -<wsdl:output> -<soap:body parts=" NewOperationResponse" use="literal"/> -</wsdl:output> -</wsdl:operation> -</wsdl:binding> -<wsdl:service name="SelfImport"> -<wsdl:port binding="tns:SelfImportSOAP" name="SelfImportSOAP"> -<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/SelfImport/SimpleFile/SelfImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/SimpleFile/SelfImport.wsdl deleted file mode 100644 index 7891d3532..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/SimpleFile/SelfImport.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - A WSDL document with a self import. ---> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/SelfImport/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SelfImport" targetNamespace="http://www.example.org/SelfImport/"> -<wsdl:import namespace="http://www.example.org/SelfImport/" location="SelfImport.wsdl"></wsdl:import> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/SelfImport/"> -<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="SelfImport"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -<wsdl:binding name="SelfImportSOAP" type="tns:SelfImport"> -<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> -<wsdl:operation name="NewOperation"> -<soap:operation soapAction="http://www.example.org/SelfImport/NewOperation"/> -<wsdl:input> -<soap:body parts=" NewOperationRequest" use="literal"/> -</wsdl:input> -<wsdl:output> -<soap:body parts=" NewOperationResponse" use="literal"/> -</wsdl:output> -</wsdl:operation> -</wsdl:binding> -<wsdl:service name="SelfImport"> -<wsdl:port binding="tns:SelfImportSOAP" name="SelfImportSOAP"> -<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/SelfImport/SimpleFileInvalid/SelfImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/SimpleFileInvalid/SelfImport.wsdl deleted file mode 100644 index fec8c4236..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/WSDL/SelfImport/SimpleFileInvalid/SelfImport.wsdl +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - An invalid WSDL document with a self import. ---> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/SelfImport/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="SelfImport" targetNamespace="http://www.example.org/SelfImport/"> -<wsdl:import namespace="http://www.example.org/SelfImport/" location="SelfImport.wsdl"></wsdl:import> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/SelfImport/"> -<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:InvalidElement" name="NewOperationResponse"/> -</wsdl:message> -<wsdl:message name="NewOperationRequest"> -<wsdl:part element="tns:NewOperationRequest" name="NewOperationRequest"/> -</wsdl:message> -<wsdl:portType name="SelfImport"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -<wsdl:binding name="SelfImportSOAP" type="tns:SelfImport"> -<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> -<wsdl:operation name="NewOperation"> -<soap:operation soapAction="http://www.example.org/SelfImport/NewOperation"/> -<wsdl:input> -<soap:body parts=" NewOperationRequest" use="literal"/> -</wsdl:input> -<wsdl:output> -<soap:body parts=" NewOperationResponse" use="literal"/> -</wsdl:output> -</wsdl:operation> -</wsdl:binding> -<wsdl:service name="SelfImport"> -<wsdl:port binding="tns:SelfImportSOAP" name="SelfImportSOAP"> -<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/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/ImportNoNSSchema/ImportNoNSSchema.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/ImportNoNSSchema.wsdl deleted file mode 100644 index 67febb78a..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/ImportNoNSSchema.wsdl +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:tns="http://Simple/Test" -xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" -xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Test" -targetNamespace="http://Simple/Test"> - <wsdl:types> - <xsd:schema targetNamespace="http://Simple/Test" -xmlns:tns="http://Simple/Test" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:import schemaLocation="NoTns.xsd"/> - <xsd:element name="operation1"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="input1" nillable="true" type="NoTns"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:schema> - </wsdl:types> - <wsdl:message name="operation1RequestMsg"> - <wsdl:part element="tns:operation1" name="operation1Parameters"/> - </wsdl:message> - <wsdl:portType name="Test"> - <wsdl:operation name="operation1"> - <wsdl:input message="tns:operation1RequestMsg" name="operation1Request"/> - </wsdl:operation> - </wsdl:portType> -</wsdl:definitions>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/NoTns.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/NoTns.xsd deleted file mode 100644 index 1f9c2ba0e..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchema/NoTns.xsd +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:complexType name="NoTns"> - <xsd:sequence> - <xsd:element minOccurs="0" name="attribute1" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> -</xsd:schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl deleted file mode 100644 index 71d7948fa..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/ImportNoNSSchemaAndSecondSchemaWithNS.wsdl +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/ImportSchemaNoNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ImportSchemaNoNamespace" targetNamespace="http://www.example.org/ImportSchemaNoNamespace/"> -<wsdl:types> -<xsd:schema targetNamespace="http://www.example.org/ImportSchemaNoNamespace/"> - <xsd:import schemaLocation="noTNS.xsd"/> -</xsd:schema> -<xsd:schema targetNamespace="http://www.example.org/ImportSchemaNoNamespace/"> -<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="ImportSchemaNoNamespace"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/noTNS.xsd b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/noTNS.xsd deleted file mode 100644 index c7080bab4..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ImportNoNSSchemaAndSecondSchemaWithNS/noTNS.xsd +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> -</xsd:schema> 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/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl deleted file mode 100644 index 24137609b..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/InlineSchemaNoNamespace/InlineSchemaNoNamespace.wsdl +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/InlineSchemaNoNamespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="InlineSchemaNoNamespace" targetNamespace="http://www.example.org/InlineSchemaNoNamespace/"> -<wsdl:types> -<xsd:schema> - -</xsd:schema> -<xsd:schema targetNamespace="http://www.example.org/InlineSchemaNoNamespace/"> -<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="InlineSchemaNoNamespace"> -<wsdl:operation name="NewOperation"> -<wsdl:input message="tns:NewOperationRequest"/> -<wsdl:output message="tns:NewOperationResponse"/> -</wsdl:operation> -</wsdl:portType> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/NoNSElementReference/NoNSElementReference.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/NoNSElementReference/NoNSElementReference.wsdl deleted file mode 100644 index eb302d44f..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/NoNSElementReference/NoNSElementReference.wsdl +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="NoNSElementReference" targetNamespace="http://www.example.org/NoNSElementReference/" xmlns:tns="http://www.example.org/NoNSElementReference/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:documentation> - This WSDL file demonstrates a message referring to an element that is defined - by an inline schema with no target namespace. - </wsdl:documentation> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="NewOperationRequest" type="xsd:string"/> - </xsd:schema> - </wsdl:types> - <wsdl:message name="NewOperationRequest"> - <wsdl:part name="NewOperationRequest" element="NewOperationRequest"/> - </wsdl:message> -</wsdl:definitions> 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 5833d75a4..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/OneErrorForInlineXSDRefInvalidInlineXSD/OneErrorForInlineXSDRefInvalidInlineXSD.wsdl +++ /dev/null @@ -1,20 +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:import namespace="http://tempuri.org/OneErrorForInlineXSDRefInvalidInlineXSD/1"/> - <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 1f2d91580..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineType.wsdl +++ /dev/null @@ -1,29 +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:import namespace="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:import namespace="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>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl b/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.wsdl deleted file mode 100644 index 9598fdac5..000000000 --- a/tests/org.eclipse.wst.wsdl.validation.tests/testresources/samples/XSD/ReferToAnotherInlineType/ReferToAnotherInlineTypeNoImport.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> |