diff options
Diffstat (limited to 'tests/org.eclipse.wst.xml.validation.tests')
98 files changed, 0 insertions, 2873 deletions
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.classpath b/tests/org.eclipse.wst.xml.validation.tests/.classpath deleted file mode 100644 index cb0105380..000000000 --- a/tests/org.eclipse.wst.xml.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.xml.validation.tests/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/.cvsignore deleted file mode 100644 index 2c9b88de7..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -temp.folder -build.xml -validatexmltests.jar diff --git a/tests/org.eclipse.wst.xml.validation.tests/.project b/tests/org.eclipse.wst.xml.validation.tests/.project deleted file mode 100644 index 112562ff9..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.xml.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.xml.validation.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index afa5c9135..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Apr 04 03:36:32 EDT 2006 -eclipse.preferences.version=1 -encoding/<project>=ISO-8859-1 diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2dd8b5cef..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,80 +0,0 @@ -#Sun Apr 16 14:37:21 EDT 2006 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -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.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -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=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -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=error -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore -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=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -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=error -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index ef2ac6532..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Apr 04 03:36:39 EDT 2006 -eclipse.preferences.version=1 -internal.default.compliance=default diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index c59368c5e..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Apr 04 03:36:32 EDT 2006 -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs deleted file mode 100644 index f72495846..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,15 +0,0 @@ -#Sun Apr 16 14:05:29 EDT 2006 -compilers.p.build=0 -compilers.p.deprecated=1 -compilers.p.illegal-att-value=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.p.unused-element-or-attribute=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF deleted file mode 100644 index d21883ca2..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.eclipse.wst.xml.validation.tests -Bundle-Version: 1.0.201 -Bundle-ClassPath: validatexmltests.jar -Bundle-Activator: org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin -Bundle-Vendor: %Bundle-Vendor.0 -Bundle-Localization: plugin -Export-Package: org.eclipse.wst.xml.validation.tests.internal;x-internal:=true -Require-Bundle: org.junit, - org.eclipse.core.runtime, - org.eclipse.wst.xml.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.validation, - org.eclipse.core.resources, - org.eclipse.wst.common.uriresolver -Eclipse-LazyStart: true diff --git a/tests/org.eclipse.wst.xml.validation.tests/about.html b/tests/org.eclipse.wst.xml.validation.tests/about.html deleted file mode 100644 index 6f6b96c4c..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/about.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>February 24, 2005</p> -<h3>License</h3> - -<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. -For purposes of the EPL, "Program" will mean the Content.</p> - -<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p> - -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties deleted file mode 100644 index 4b89c52fa..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -bin.includes = test.xml,\ - testresources/,\ - validatexmltests.jar,\ - META-INF/,\ - about.html -source.validatexmltests.jar = src/ -bin.excludes = testresources/.cvsignore diff --git a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties deleted file mode 100644 index 65c05683a..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties +++ /dev/null @@ -1,3 +0,0 @@ -# properties file for org.eclipse.wst.xml.validation.tests -Bundle-Vendor.0 = Eclipse -Bundle-Name.0 = XML Validator Tests Plug-in
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java deleted file mode 100644 index 91f7f9aeb..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java +++ /dev/null @@ -1,130 +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.xml.core.internal.validation; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Test the XMLValidationConfiguration class. - */ -public class XMLValidationConfigurationTest extends TestCase -{ - XMLValidationConfiguration configuration; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(XMLValidationConfigurationTest.class); - } - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - super.setUp(); - configuration = new XMLValidationConfiguration(); - } - - - protected void tearDown() throws Exception - { - configuration = null; - super.tearDown(); - } - - - /** - * Test the default setting of the WARN_NO_GRAMMAR feature. - */ - public void testSetWarnNoGrammarFeatureDefault() - { - try - { - assertFalse("The WARN_NO_GRAMMAR feature is not set by default to false.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR)); - } - catch(Exception e) - { - fail("Unable to set read the WARN_NO_GRAMMAR feature: " + e); - } - } - - /** - * Test setting the WARN_NO_GRAMMAR feature to true. - */ - public void testSetWarnNoGrammarFeatureTrue() - { - try - { - configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, true); - assertTrue("The WARN_NO_GRAMMAR feature is not set to true.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR)); - } - catch(Exception e) - { - fail("Unable to set WARN_NO_GRAMMAR to true: " + e); - } - } - - /** - * Test setting the WARN_NO_GRAMMAR feature to false. - */ - public void testSetWarnNoGrammarFeatureFalse() - { - try - { - configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false); - assertFalse("The WARN_NO_GRAMMAR feature is not set to false.", configuration.getFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR)); - } - catch(Exception e) - { - fail("Unable to set WARN_NO_GRAMMAR to false: " + e); - } - } - - /** - * Test setting a feature that doesn't exist. - */ - public void testSetNotExistantFeature() - { - try - { - configuration.setFeature("NON_EXISTANT_FEATURE", false); - fail("Setting a non existant feature did not produce an exception."); - } - catch(Exception e) - { - // The test succeeds if the exception is caught. - } - } - - /** - * Test getting a feature that doesn't exist. - */ - public void testGetNotExistantFeature() - { - try - { - configuration.getFeature("NON_EXISTANT_FEATURE"); - fail("Getting a non existant feature did not produce an exception."); - } - catch(Exception e) - { - // The test succeeds if the exception is caught. - } - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java deleted file mode 100644 index f0a68e716..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java +++ /dev/null @@ -1,186 +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.xml.core.internal.validation.eclipse; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.wst.validation.internal.core.Message; -import org.eclipse.wst.xml.core.internal.XMLCorePlugin; -import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; -import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin; - -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 addInfoToMessage method. The following tests are performed:<br/> - * 1. When the validation message contains a null key nothing is added to the message.<br/> - * 2. When the message contains the key "ENTIRE_ELEMENT" the three attributes are added - * to the method and the SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE is null.<br/> - * 3. When the message contains the key "EntityNotDeclared" the three attributes are set. - */ - public void testAddInfoToMessage() - { - // These strings are common addition information types. - String COLUMN_NUMBER_ATTRIBUTE = "columnNumber"; //$NON-NLS-1$ - String SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = "squiggleSelectionStrategy"; //$NON-NLS-1$ - String SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = "squiggleNameOrValue"; //$NON-NLS-1$ - - // Test that the message does not contain the attributes when the method is called - // with a null key. - ValidationMessage validationMessage = new ValidationMessage("", 1, 1, ""); - Message message = new Message(); - validator.addInfoToMessage(validationMessage, message); - assertNull("COLUMN_NUMBER_ATTRIBUTE was not null for a ValidationMessage with a null key. COLUMN_NUMBER_ATTRIBUTE = " + message.getAttribute(COLUMN_NUMBER_ATTRIBUTE), message.getAttribute(COLUMN_NUMBER_ATTRIBUTE)); - assertNull("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE)); - assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with a null key. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE)); - - // Test that the message contains the three attributes when the key is set to "ElementUnterminated". - ValidationMessage validationMessage2 = new ValidationMessage("", 1, 1, "", "ElementUnterminated", null); - Message message2 = new Message(); - validator.addInfoToMessage(validationMessage2, message2); - assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key ENTIRE_ELEMENT. COLUMN_NUMBER_ATTRIBUTE = " + message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE)); - assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not ENTIRE_ELEMENT. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "ENTIRE_ELEMENT", message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE)); - assertNull("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not null for a ValidationMessage with the key ENTIRE_ELEMENT. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), message2.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE)); - - // Test that the message contains the three attributes when the key is set to "EntityNotDeclared". - ValidationMessage validationMessage3 = new ValidationMessage("", 1, 1, "", "EntityNotDeclared", new Object[]{"MyName"}); - Message message3 = new Message(); - validator.addInfoToMessage(validationMessage3, message3); - assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key EntityNotDeclared. COLUMN_NUMBER_ATTRIBUTE = " + message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE)); - assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not TEXT_ENTITY_REFERENCE. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "TEXT_ENTITY_REFERENCE", message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE)); - assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not set to MyName for a ValidationMessage with the key EntityNotDeclared. SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE), "MyName", message3.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE)); - } - - /** - * 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. - String PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/"; - String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml"; - ValidationReport report1 = validator.validate(uri, null, null); - ValidationReport report2 = null; - InputStream is = null; - try - { - is = new URL(uri).openStream(); - report2 = validator.validate(uri, is, null); - } - 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. - } - } - } - 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. - uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml"; - report1 = validator.validate(uri, null, null); - report2 = null; - is = null; - try - { - is = new URL(uri).openStream(); - report2 = validator.validate(uri, is, null); - } - 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. - } - } - } - 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 that the warn no grammar preference is read from the XML core preferences. - * There are three tests to perform. - * 1. Test that the default preference is disabled. - * 2. Test that setting the preference to enabled works. - * 3. Test that setting the preference to disabled works. - */ - public void testWarnNoGrammarPreference() - { - // Test that the default preference is disabled. - validator.setupValidation(null); - assertFalse("The default warn no grammar preference is not false.", validator.getWarnNoGrammarPreference()); - - // Test that the preference is read when enabled. - XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.WARN_NO_GRAMMAR, true); - validator.setupValidation(null); - assertTrue("The warn no grammar preference is not true when the preference is set to true.", validator.getWarnNoGrammarPreference()); - - - // Test that the preference is read when disabled. - XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.WARN_NO_GRAMMAR, false); - validator.setupValidation(null); - assertFalse("The warn no grammar preference is not false when the preference is set to false.", validator.getWarnNoGrammarPreference()); - - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java deleted file mode 100644 index eb6ad9971..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorWrapper.java +++ /dev/null @@ -1,48 +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.xml.core.internal.validation.eclipse; - -import org.eclipse.wst.validation.internal.provisional.core.IMessage; -import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage; - -/** - * 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) - */ - protected 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); - } - -/** - * Export the warn no grammar preference for testing. - * - * @return The warn no grammar preference. - */ - public boolean getWarnNoGrammarPreference() - { - return warnNoGrammar; - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java deleted file mode 100644 index 4dbf3cba4..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLMessageInfoHelperTest.java +++ /dev/null @@ -1,56 +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.xml.core.internal.validation.eclipse; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Test case to test the XMLMessageInfoHelper class. - */ -public class XMLMessageInfoHelperTest extends TestCase -{ - private XMLMessageInfoHelper helper = new XMLMessageInfoHelper(); - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(XMLMessageInfoHelperTest.class); - } - - /** - * Test that the createMessageInfo method returns {"", null} when - * given a non-existant key and null message arguments. - */ - public void testNotExistantKeyAndNullMessageArguments() - { - String[] messageInfo = helper.createMessageInfo("NON_EXISTANT_KEY", null); - assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]); - assertNull("The nameOrValue returned was not null.", messageInfo[1]); - } - - /** - * Test that the createMessageInfo method returns {"", null} when - * given a non-existant key and null message arguments. - */ - public void testNullKeyAndMessageArguments() - { - String[] messageInfo = helper.createMessageInfo(null, null); - assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]); - assertNull("The nameOrValue returned was not null.", messageInfo[1]); - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.java deleted file mode 100644 index f0055c917..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorTest.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.xml.core.internal.validation.eclipse; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Test the Eclipse specific XML validator. - */ -public class XMLValidatorTest 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(XMLValidatorTest.class); - } - - /** - * Test to ensure the URI resolver is not null in the Eclipse - * specific XML validator. - */ - public void testURIResolverIsRegistered() - { - XMLValidatorWrapper validator = new XMLValidatorWrapper(); - assertNotNull("The URI resolver is null.", validator.getURIResolver()); - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.java deleted file mode 100644 index 8e1a096f3..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/XMLValidatorWrapper.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.xml.core.internal.validation.eclipse; - -import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver; - -/** - * Wrapper for the Eclipse XML validator class to allow for testing. - */ -public class XMLValidatorWrapper extends XMLValidator -{ - /** - * Constructor. - */ - public XMLValidatorWrapper() - { - super(); - } - - /** - * Get the URI resolver registered on the XML validator. - * - * @return The URI resolver registered on the XML validator. - */ - public URIResolver getURIResolver() - { - return uriResolver; - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java deleted file mode 100644 index 7c4953ead..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java +++ /dev/null @@ -1,126 +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.xml.core.internal.validation.errorcustomization; - -import junit.framework.TestCase; - -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.errorcustomization.ErrorCustomizationManager.ErrorMessageInformation; - -/** - * Test the ErrorCustomizationManager class. - */ -public class ErrorCustomizationManagerTest extends TestCase -{ - - /** - * Test the startElement method with the following tests: - * 1. Test that the root element is properly pushed to the stack. - * 2. Test that a subsequent element is properly pushed to the stack and - * registered as a child element. - */ - public void testStartElement() - { - // 1. Test that the root element is properly pushed to the stack. - String namespace1 = "http://namespace1"; - String localname1 = "localname"; - ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper(); - assertEquals("1. The element information stack is not empty to start.", 0, manager.getElementInformationStack().size()); - manager.startElement(namespace1, localname1); - ElementInformation elemInfo = (ElementInformation)manager.getElementInformationStack().pop(); - assertEquals("1. The element information stack is not empty to after popping the top element.", 0, manager.getElementInformationStack().size()); - assertEquals("1. The namespace specified on the element information is not http://namespace1 it is " + elemInfo.getNamespace(), namespace1, elemInfo.getNamespace()); - assertEquals("1. The local name specified on the element information is not localname it is " + elemInfo.getLocalname(), localname1, elemInfo.getLocalname()); - - // 2. Test that a subsequent element is properly pushed to the stack and registered as a child element. - String localname2 = "localname2"; - ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper(); - assertEquals("2. The element information stack is not empty to start.", 0, manager2.getElementInformationStack().size()); - manager2.startElement(namespace1, localname1); - manager2.startElement(namespace1, localname2); - assertEquals("2. The element information stack does not contain 2 elements.", 2, manager2.getElementInformationStack().size()); - ElementInformation elemInfo2 = (ElementInformation)manager2.getElementInformationStack().pop(); - assertEquals("2. The element information stack does not contain 1 element after popping the top element.", 1, manager2.getElementInformationStack().size()); - assertEquals("2. The namespace specified on the element information child is not http://namespace1 it is " + elemInfo2.getNamespace(), namespace1, elemInfo2.getNamespace()); - assertEquals("2. The local name specified on the element information child is not localname2 it is " + elemInfo2.getLocalname(), localname2, elemInfo2.getLocalname()); - ElementInformation elemInfo3 = (ElementInformation)manager2.getElementInformationStack().pop(); - assertEquals("2. The element information stack does not contain 0 elements after popping the top element.", 0, manager2.getElementInformationStack().size()); - assertEquals("2. The namespace specified on the element information is not http://namespace1 it is " + elemInfo3.getNamespace(), namespace1, elemInfo3.getNamespace()); - assertEquals("2. The local name specified on the element information is not localname it is " + elemInfo3.getLocalname(), localname1, elemInfo3.getLocalname()); - assertEquals("2. The element information does not contain 1 child element it contains " + elemInfo3.getChildren().size(), 1, elemInfo3.getChildren().size()); - ElementInformation elemInfo4 = (ElementInformation)elemInfo3.getChildren().get(0); - assertEquals("2. The namespace specified on the element information's child is not http://namespace1 it is " + elemInfo4.getNamespace(), namespace1, elemInfo4.getNamespace()); - assertEquals("2. The local name specified on the element information's child is not localname2 it is " + elemInfo4.getLocalname(), localname2, elemInfo4.getLocalname()); - } - - /** - * Test the endElement method with the following tests: - * 1. Check that the last element on the stack is successfully popped. - * 2. Test that an element in a sample namespace produces the expected message. - * 3. Test that an element not in a sample namespace retains its value. - */ - public void testEndElement() - { - // 1. Check that the last element on the stack is successfully popped. - String namespace1 = "http://namespace1"; - String localname1 = "localname"; - ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper(); - manager.getElementInformationStack().push(new ElementInformation(namespace1, localname1)); - manager.endElement(namespace1, localname1); - assertEquals("1. The stack still contains an element.", 0, manager.getElementInformationStack().size()); - - // 2. Test that an element in a sample namespace produces the expected message. - String namespace2 = "XMLValidationTestSampleNamespace"; - ErrorCustomizationRegistry.getInstance().addErrorMessageCustomizer(namespace2, new SampleErrorMessageCustomizer()); - ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper(); - manager2.getElementInformationStack().push(new ElementInformation(namespace2, localname1)); - ErrorMessageInformation emi = manager2.new ErrorMessageInformation(); - emi.message = new ValidationMessage("SampleMessage", 1, 2, namespace2); - manager2.setMessageForConsideration(emi); - manager2.endElement(namespace2, localname1); - assertEquals("2. The message was not customized to AAAA. The message is " + emi.message.getMessage(), "AAAA", emi.message.getMessage()); - - // 3. Test that an element not in a sample namespace retains its value. - String namespace3 = "XMLValidationTestSampleNamespace3"; - ErrorCustomizationManagerWrapper manager3 = new ErrorCustomizationManagerWrapper(); - manager3.getElementInformationStack().push(new ElementInformation(namespace3, localname1)); - ErrorMessageInformation emi2 = manager3.new ErrorMessageInformation(); - emi2.message = new ValidationMessage("SampleMessage", 1, 2, namespace3); - manager3.setMessageForConsideration(emi2); - manager3.endElement(namespace3, localname1); - assertEquals("3. The message did not retain its value of SampleMessage. The message is " + emi2.message.getMessage(), "SampleMessage", emi2.message.getMessage()); - } - - /** - * Test the considerReportedError method with the following tests: - * 1. Check that the messageForConsideration is not set if there are no current - * validation messages. - * 2. Check that the messageForConsideration is set correctly if there is a - * validation message. - */ - public void testConsiderReportedError() - { - // 1. Check that the messageForConsideration is not set if there are no current validation messages. - String namespace1 = "http://namespace1"; - ErrorCustomizationManagerWrapper manager = new ErrorCustomizationManagerWrapper(); - ValidationInfo valinfo = new ValidationInfo(namespace1); - manager.considerReportedError(valinfo, "key", null); - assertNull("1. The messageForConsideration is not null when no validation messages exist.", manager.getMessageForConsideration()); - - // 2. Check that the messageForConsideration is set correctly if there is a validation message. - ErrorCustomizationManagerWrapper manager2 = new ErrorCustomizationManagerWrapper(); - ValidationInfo valinfo2 = new ValidationInfo(namespace1); - valinfo2.addError("message", 1, 1, namespace1); - manager2.considerReportedError(valinfo2, "key", null); - assertNotNull("2. The messageForConsideration is null when a validation message exists.", manager2.getMessageForConsideration()); - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java deleted file mode 100644 index 68202bcaf..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerWrapper.java +++ /dev/null @@ -1,52 +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.xml.core.internal.validation.errorcustomization; - -import java.util.Stack; - -/** - * A wrapper for class ErrorCustomizationManager to facilitate testing. - */ -public class ErrorCustomizationManagerWrapper extends ErrorCustomizationManager -{ - /** - * Get the element information stack. - * - * @return - * The element information stack. - */ - public Stack getElementInformationStack() - { - return elementInformationStack; - } - - /** - * Get the current message for consideration. - * - * @return - * The current message for consideration. - */ - public ErrorMessageInformation getMessageForConsideration() - { - return messageForConsideration; - } - - /** - * Set the current message for consideration. - * - * @param message - * The current message for consideration. - */ - public void setMessageForConsideration(ErrorMessageInformation message) - { - messageForConsideration = message; - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java deleted file mode 100644 index bb03412b8..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryTest.java +++ /dev/null @@ -1,112 +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.xml.core.internal.validation.errorcustomization; - -import junit.framework.TestCase; - -/** - * Tests for the ErrorCustomizationRegistry class. - */ -public class ErrorCustomizationRegistryTest extends TestCase -{ - private ErrorCustomizationRegistry registry = null; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception - { - registry = new ErrorCustomizationRegistryWrapper(); - super.setUp(); - } - - /** - * Test the AddErrorMessageCustomizerToRegistry method with the following tests: - * 1. Test that adding an error customizer for a namespace is successful. - * 2. Test that adding two error customizers for a namespace returns both customizers. - * 3. Test that adding an entry with a null namespace adds the entry for the empty string - * namespace. - */ - public void testAddErrorMessageCustomizerToRegistry() - { - // 1. Test that adding an error customizer for a namespace is successful. - String namespace1 = "http://namespace1"; - IErrorMessageCustomizer customizer = new IErrorMessageCustomizer(){ - public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments) - { - // This stub for testing does not require an implementation. - return null; - } - }; - registry.addErrorMessageCustomizer(namespace1, customizer); - IErrorMessageCustomizer[] registeredCustomizers = registry.getCustomizers(namespace1); - assertEquals("1. There should only be 1 customizer registered for the namespace but there are " + registeredCustomizers.length, 1, registeredCustomizers.length); - assertEquals("1. The IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]); - - // 2. Test that adding two error customizers for a namespace returns both customizers. - IErrorMessageCustomizer customizer2 = new IErrorMessageCustomizer(){ - public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments) - { - // This stub for testing does not require an implementation. - return null; - } - }; - registry.addErrorMessageCustomizer(namespace1, customizer2); - registeredCustomizers = registry.getCustomizers(namespace1); - assertEquals("2. There should be 2 customizers registered for the namespace but there are " + registeredCustomizers.length, 2, registeredCustomizers.length); - assertEquals("2. The first IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]); - assertEquals("2. The second IErrorMessageCustomizer returned is not the same one registered.", customizer2, registeredCustomizers[1]); - - // 3. Test that adding an entry with a null namespace adds the entry for the empty string namespace. - registry.addErrorMessageCustomizer(null, customizer); - registeredCustomizers = registry.getCustomizers(""); - assertEquals("3. There should be 1 customizers registered for the namespace but there are " + registeredCustomizers.length, 1, registeredCustomizers.length); - assertEquals("3. The IErrorMessageCustomizer returned is not the same one registered.", customizer, registeredCustomizers[0]); - } - - /** - * Test the getCustomizers method with the following tests: - * 1. Test that requesting an error customizer array for a namespace that has not been - * registered produces an empty array. - * 2. Test that requesting an error customizer array for the null namespace returns the - * one registered customizer. - * 3. Test that requesting an error customizer array for the empty string namespace returns - * the one registered customizer. - */ - public void testGetCustomizers() - { - // 1. Test that requesting an error customizer list for a namespace that has not been - // registered produces an empty list. - IErrorMessageCustomizer[] customizers = registry.getCustomizers("http://nonregisterednamespace"); - assertEquals("1. The array of customizers for an unregistered namespace is not empty.", 0, customizers.length); - - // 2. Test that requesting an error customizer array for the null namespace returns the - // one registered customizer. - IErrorMessageCustomizer customizer = new IErrorMessageCustomizer(){ - public String customizeMessage(ElementInformation elementInfo, String errorKey, Object[] arguments) - { - // This stub for testing does not require an implementation. - return null; - } - }; - registry.addErrorMessageCustomizer(null, customizer); - customizers = registry.getCustomizers(null); - assertEquals("2. The array of customizers for a registered customizer for the null namespace does not contain 1 customizer.", 1, customizers.length); - assertEquals("2. The customizer for the null namespace was not successfully returned.", customizer, customizers[0]); - - // 3. Test that requesting an error customizer array for the empty string namespace returns - // the one registered customizer for the null namespace. - customizers = registry.getCustomizers(""); - assertEquals("3. The array of customizers for a registered customizer for the null namespace does not contain 1 customizer for the empty string namespace.", 1, customizers.length); - assertEquals("3. The customizer for the empty string namespace was not successfully returned.", customizer, customizers[0]); - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java deleted file mode 100644 index 2e02d734e..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationRegistryWrapper.java +++ /dev/null @@ -1,26 +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.xml.core.internal.validation.errorcustomization; - -/** - * A wrapper for the ErrorCustomizationRegistry class to allow for testing. - */ -public class ErrorCustomizationRegistryWrapper extends ErrorCustomizationRegistry -{ - /** - * Public constructor. - */ - public ErrorCustomizationRegistryWrapper() - { - super(); - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java deleted file mode 100644 index 24f7e4999..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateTest.java +++ /dev/null @@ -1,63 +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.xml.core.internal.validation.errorcustomization; - -import junit.framework.TestCase; - -import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin; - -/** - * Test the ErrorMessageCustomizerDelegate class. - */ -public class ErrorMessageCustomizerDelegateTest extends TestCase -{ - /** - * Test the loadCustomizer method with the following tests: - * 1. Test that a valid bundle a class succeeds. - * 2. Test that an invalid class fails and keeps the customizer set to null. - * 3. Test that a null bundle fails and keeps the customizer set to null. - */ - public void testLoadCustomizer() - { - // 1. Test that a valid bundle a class succeeds. - ErrorMessageCustomizerDelegateWrapper delegate = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer"); - delegate.loadCustomizer(); - assertNotNull("1. The customizer loaded was null for a valid customizer and bundle.", delegate.getCustomizer()); - - // 2. Test that an invalid class fails and keeps the customizer set to null. - ErrorMessageCustomizerDelegateWrapper delegate2 = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.NonexistantErrorMessageCustomizer"); - delegate2.loadCustomizer(); - assertNull("2. The customizer loaded was not null for an invalid customizer class.", delegate2.getCustomizer()); - - // 3. Test that a null bundle fails and keeps the customizer set to null. - ErrorMessageCustomizerDelegateWrapper delegate3 = new ErrorMessageCustomizerDelegateWrapper(null, "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer"); - delegate3.loadCustomizer(); - assertNull("3. The customizer loaded was not null for a null bundle.", delegate3.getCustomizer()); - } - - /** - * Test the customizeMessage method with the following tests: - * 1. Test that the message returned is correct for a valid customizer. - * 2. Test that the message returned is null for an invalid customizer class. - */ - public void testCustomizeMessage() - { - // 1. Test that the message returned is correct for a valid customizer. - ErrorMessageCustomizerDelegateWrapper delegate = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.SampleErrorMessageCustomizer"); - String message = delegate.customizeMessage(null, null, null); - assertEquals("1. The message returned was not AAAA.", "AAAA", message); - - // 2. Test that the message returned is null for an invalid customizer class. - ErrorMessageCustomizerDelegateWrapper delegate2 = new ErrorMessageCustomizerDelegateWrapper(XMLValidatorTestsPlugin.getPlugin().getBundle(), "org.eclipse.wst.xml.core.internal.validation.errorcustomization.NonexistantErrorMessageCustomizer"); - message = delegate2.customizeMessage(null, null, null); - assertNull("2. The message returned was not null for an invalid customizer.", message); - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java deleted file mode 100644 index eb87161ab..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorMessageCustomizerDelegateWrapper.java +++ /dev/null @@ -1,41 +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.xml.core.internal.validation.errorcustomization; - -import org.osgi.framework.Bundle; - -/** - * A wrapper of the class ErrorMessageCustomizerDelegate to facilitate testing. - */ -public class ErrorMessageCustomizerDelegateWrapper extends ErrorMessageCustomizerDelegate -{ - /** - * Constructor. - */ - public ErrorMessageCustomizerDelegateWrapper(Bundle bundle, String classname) - { - super(bundle, classname); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorMessageCustomizerDelegate#loadCustomizer() - */ - public void loadCustomizer() - { - super.loadCustomizer(); - } - - public IErrorMessageCustomizer getCustomizer() - { - return customizer; - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java deleted file mode 100644 index 7b6182897..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/SampleErrorMessageCustomizer.java +++ /dev/null @@ -1,28 +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.xml.core.internal.validation.errorcustomization; - -/** - * A sample error message customizer for testing. This customizer has a simple - * implementation that simple returns the string "AAAA". - */ -public class SampleErrorMessageCustomizer implements IErrorMessageCustomizer { - - /* (non-Javadoc) - * @see org.eclipse.wst.xml.core.internal.validation.errorcustomization.IErrorMessageCustomizer#customizeMessage(org.eclipse.wst.xml.core.internal.validation.errorcustomization.ElementInformation, java.lang.String, java.lang.Object[]) - */ - public String customizeMessage(ElementInformation elementInfo, - String errorKey, Object[] arguments) { - // TODO Auto-generated method stub - return "AAAA"; - } - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java deleted file mode 100644 index 1d276eea8..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java +++ /dev/null @@ -1,56 +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.xml.validation.tests.internal; -import junit.framework.Test; - -import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfigurationTest; -import org.eclipse.wst.xml.core.internal.validation.eclipse.ValidatorTest; -import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLMessageInfoHelperTest; -import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLValidatorTest; -import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationManagerTest; -import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorCustomizationRegistryTest; -import org.eclipse.wst.xml.core.internal.validation.errorcustomization.ErrorMessageCustomizerDelegateTest; - -/** - * The root test suite that contains all other XML validator test suites. - */ -public class AllXMLTests extends junit.framework.TestSuite -{ - /** - * Create this test suite. - * - * @return This test suite. - */ - public static Test suite() - { - return new AllXMLTests(); - } - - /** - * Constructor - */ - public AllXMLTests() - { - super("XMLTestsTestSuite"); - addTest(XMLValidationConfigurationTest.suite()); - addTest(ValidatorTest.suite()); - addTest(XMLMessageInfoHelperTest.suite()); - addTest(XMLValidatorTest.suite()); - addTest(XMLExamplesTest.suite()); - addTest(BugFixesTest.suite()); - addTest(PathsTest.suite()); - addTestSuite(ErrorCustomizationManagerTest.class); - addTestSuite(ErrorMessageCustomizerDelegateTest.class); - addTestSuite(ErrorCustomizationRegistryTest.class); - addTestSuite(LineNumberAdjustmentsTest.class); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java deleted file mode 100644 index 9bc17c8b6..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java +++ /dev/null @@ -1,94 +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.xml.validation.tests.internal; - -import java.io.IOException; -import java.util.List; - -import junit.framework.TestCase; - -import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; -import org.eclipse.wst.xml.core.internal.validation.eclipse.XMLValidator; - - -/** - * 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 XMLValidator validator = XMLValidator.getInstance(); - protected XMLValidationConfiguration configuration; - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws IOException - { - PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/"; - configuration = new XMLValidationConfiguration(); - try - { - configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false); - } - catch(Exception e) - { - fail("Unable to set the feature on the XML validation configuration."); - } - } - - /** - * Run a validator test. The test will run the validator, and compare the validation result with - * the information specified. - * - * @param testfile The file to run the validator test on. - * @param keys The list of allows message keys. - * @param numErrors The number of expected errors. - * @param numWarnings The number of expected warnings. - */ - public void runTest(String testfile, List keys, int numErrors, int numWarnings) - { - ValidationReport valreport = validator.validate(testfile, null, configuration); - - ValidationMessage[] valmessages = valreport.getValidationMessages(); - int nummessages = valmessages.length; - - int errorCount = 0; - int warningCount = 0; - - for(int i = 0; i < nummessages; i++) - { - ValidationMessage valmes = valmessages[i]; - String key = valmes.getKey(); - assertTrue("The message key " + key + " is not correct.", keys.contains(key)); - if(valmes.getSeverity() == ValidationMessage.SEV_LOW) - { - warningCount++; - } - else - { - errorCount++; - } - } - assertEquals(errorCount + " errors were reported but " + numErrors + " errors were expected.", numErrors, errorCount); - assertEquals(warningCount + " warnings were reported but " + numWarnings + " warnings were expected.", numWarnings, warningCount); - } - - -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java deleted file mode 100644 index 018bf139b..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java +++ /dev/null @@ -1,169 +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.xml.validation.tests.internal; - -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration; -/** - * Test class for the XML validator to test bug fixes. - */ -public class BugFixesTest extends BaseTestCase -{ - private static final String BUGFIXES_DIR = "bugfixes/"; - - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(BugFixesTest.class); - } - - /** - * Test /bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml. - */ - public void testRootNoNSChildNS() - { - String testname = "RootNoNSChildNS"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "RootNoNSChildNS/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/EmptyFile/Empty.xml. - */ - public void testEmpty() - { - String testname = "Empty"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml. - */ - public void testValidateWithDTDValid() - { - String testname = "ValidateWithDTDValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml. - */ - public void testValidateWithDTDInvalid() - { - String testname = "ValidateWithDTDInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MSG_CONTENT_INVALID"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/NotWellFormed/NotWellFormed.xml. - */ - public void testNotWellFormed() - { - String testname = "NotWellFormed"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NotWellFormed/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("ETagRequired"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/CannotLocateDTD/InvalidHost.xml. - */ - public void testInvalidHost() - { - String testname = "InvalidHost"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "CannotLocateDTD/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("FILE_NOT_FOUND"); - int numErrors = 0; - int numWarnings = 1; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/CannotLocateDTD/InvalidLocation.xml. - */ - public void testInvalidLocation() - { - String testname = "InvalidLocation"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "CannotLocateDTD/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("FILE_NOT_FOUND"); - int numErrors = 0; - int numWarnings = 1; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /bugfixes/NoGrammar/NoGrammar.xml. - */ - public void testNoGrammar() - { - String testname = "NoGrammar"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NoGrammar/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("NO_GRAMMAR_FOUND"); - int numErrors = 0; - int numWarnings = 1; - - try - { - configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, true); - } - catch(Exception e) - { - fail("Unable to set configuration WARN_NO_GRAMMAR."); - } - runTest(testfile, keys, numErrors, numWarnings); - try - { - configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false); - } - catch(Exception e) - { - fail("Unable to set configuration WARN_NO_GRAMMAR."); - } - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java deleted file mode 100644 index 51b6506e5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/LineNumberAdjustmentsTest.java +++ /dev/null @@ -1,133 +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.xml.validation.tests.internal; - -import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage; -import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; - -/** - * A test class to test the line number adjustments made in the XML validator. - */ -public class LineNumberAdjustmentsTest extends BaseTestCase -{ - private static final String LINE_NUMBER_ADJUSTMENTS_DIR = "LineNumberAdjustments/"; - - /** - * Run a validator test. The test will run the validator, and compare the validation result with - * the information specified. - * - * @param testfile - * The file to run the validator test on. - * @param key - * The message key. - * @param numErrors - * The number of expected errors. - * @param numWarnings - * The number of expected warnings. - * @param lineno - * The line number the message should be located on. - * @param columnno - * The column number the message should be located on. - */ - public void runTest(String testfile, String key, int numErrors, int numWarnings, int lineno, int columnno) - { - ValidationReport valreport = validator.validate(testfile, null, configuration); - - ValidationMessage[] valmessages = valreport.getValidationMessages(); - int nummessages = valmessages.length; - - int errorCount = 0; - int warningCount = 0; - - for(int i = 0; i < nummessages; i++) - { - ValidationMessage valmes = valmessages[i]; - String messkey = valmes.getKey(); - assertTrue("The message key " + key + " is not correct.", key.equals(messkey)); - assertEquals("The line number is incorrect.", lineno, valmes.getLineNumber()); - assertEquals("The column number is incorrect.", columnno, valmes.getColumnNumber()); - if(valmes.getSeverity() == ValidationMessage.SEV_LOW) - { - warningCount++; - } - else - { - errorCount++; - } - } - assertEquals(errorCount + " errors were reported but " + numErrors + " errors were expected.", numErrors, errorCount); - assertEquals(warningCount + " warnings were reported but " + numWarnings + " warnings were expected.", numWarnings, warningCount); - } - - /** - * Test /LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml. - */ - 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 + ".xml"; - String key = "cvc-complex-type.2.3"; - int lineno = 2; - int columnno = 187; - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, key, numErrors, numWarnings, lineno, columnno); - } - - /** - * Test /LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml. - */ - 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 + ".xml"; - String key = "cvc-complex-type.2.4.b"; - int lineno = 2; - int columnno = 187; - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, key, numErrors, numWarnings, lineno, columnno); - } - - /** - * Test /LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml. - */ - public void testMsgContentIncomplete() - { - String testname = "MSG_CONTENT_INCOMPLETE"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "MSG_CONTENT_INCOMPLETE/" + testname + ".xml"; - String key = "MSG_CONTENT_INCOMPLETE"; - int lineno = 6; - int columnno = 7; - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, key, numErrors, numWarnings, lineno, columnno); - } - - /** - * Test /LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml. - */ - public void testMsgContentInvalid() - { - String testname = "MSG_CONTENT_INVALID"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + LINE_NUMBER_ADJUSTMENTS_DIR + "MSG_CONTENT_INVALID/" + testname + ".xml"; - String key = "MSG_CONTENT_INVALID"; - int lineno = 6; - int columnno = 7; - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, key, numErrors, numWarnings, lineno, columnno); - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java deleted file mode 100644 index 67245f046..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java +++ /dev/null @@ -1,616 +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.xml.validation.tests.internal; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestSuite; -/** - * Test class for the XML validator to test bug fixes. - * - * @author Lawrence Mandel, IBM - */ -public class PathsTest extends BaseTestCase -{ - private static final 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); - } - - /** - * Test /Paths/Space InPath/SpaceInPathValid.xml. - */ - public void testSpaceInPathValid() - { - String testname = "SpaceInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Space InPath/SpaceInPathInvalid.xml. - */ - public void testSpaceInPathInvalid() - { - String testname = "SpaceInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.xml. - */ - public void testCloseBracketInPathValid() - { - String testname = "CloseBracketInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml. - */ - public void testCloseBracketInPathInvalid() - { - String testname = "CloseBracketInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml. - */ - public void testCloseBracketInFilenameValid() - { - String testname = "CloseBracket)InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml. - */ - public void testCloseBracketInFilenameInvalid() - { - String testname = "CloseBracket)InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Dash-InPath/DashInPathValid.xml. - */ - public void testDashInPathValid() - { - String testname = "DashInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Dash-InPath/DashInPathInvalid.xml. - */ - public void testDashInPathInvalid() - { - String testname = "DashInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/DashInFilename/Dash-InFilenameValid.xml. - */ - public void testDashInFilenameValid() - { - String testname = "Dash-InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/DashInFilename/Dash-InFilenameInvalid.xml. - */ - public void testDashInFilenameInvalid() - { - String testname = "Dash-InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Exclamation!InPath/ExclamationInPathValid.xml. - */ - public void testExclamationInPathValid() - { - String testname = "ExclamationInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.xml. - */ - public void testExclamationInPathInvalid() - { - String testname = "ExclamationInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml. - */ - public void testExclamationInFilenameValid() - { - String testname = "Exclamation!InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml. - */ - public void testExclamationInFilenameInvalid() - { - String testname = "Exclamation!InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.xml. - */ - public void testOpenBracketInPathValid() - { - String testname = "OpenBracketInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml. - */ - public void testOpenBracketInPathInvalid() - { - String testname = "OpenBracketInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml. - */ - public void testOpenBracketInFilenameValid() - { - String testname = "OpenBracket(InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml. - */ - public void testOpenBracketInFilenameInvalid() - { - String testname = "OpenBracket(InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Period.InPath/PeriodInPathValid.xml. - */ - public void testPeriodBracketInPathValid() - { - String testname = "PeriodInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Period.InPath/PeriodInPathInvalid.xml. - */ - public void testPeriodBracketInPathInvalid() - { - String testname = "PeriodInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/PeriodInFilename/Period.InFilenameValid.xml. - */ - public void testPeriodBracketInFilenameValid() - { - String testname = "Period.InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.xml. - */ - public void testPeriodBracketInFilenameInvalid() - { - String testname = "Period.InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Quote'InPath/QuoteInPathValid.xml. - */ - public void testQuoteInPathValid() - { - String testname = "QuoteInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Quote'InPath/QuoteInPathInvalid.xml. - */ - public void testQuoteInPathInvalid() - { - String testname = "QuoteInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/QuoteInFilename/Quote'InFilenameValid.xml. - */ - public void testQuoteInFilenameValid() - { - String testname = "Quote'InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.xml. - */ - public void testQuoteInFilenameInvalid() - { - String testname = "Quote'InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/SpaceInFilename/Space InFilenameValid.xml. - */ - public void testSpaceInFilenameValid() - { - String testname = "Space InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/SpaceInFilename/Space InFilenameInvalid.xml. - */ - public void testSpaceInFilenameInvalid() - { - String testname = "Space InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Tilde~InPath/TildeInPathValid.xml. - */ - public void testTildeInPathValid() - { - String testname = "TildeInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Tilde~InPath/TildeInPathInvalid.xml. - */ - public void testTildeInPathInvalid() - { - String testname = "TildeInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/TildeInFilename/Tilde~InFilenameValid.xml. - */ - public void testTildeInFilenameValid() - { - String testname = "Tilde~InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.xml. - */ - public void testTildeInFilenameInvalid() - { - String testname = "Tilde~InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Underscore_InPath/UnderscoreInPathValid.xml. - */ - public void testUnderscoreInPathValid() - { - String testname = "UnderscoreInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.xml. - */ - public void testUnderscoreInPathInvalid() - { - String testname = "UnderscoreInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml. - */ - public void testUnderscoreInFilenameValid() - { - String testname = "Underscore_InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml. - */ - public void testUnderscoreInFilenameInvalid() - { - String testname = "Underscore_InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/AngleHat^InPath/AngleHatInPathValid.xml. - */ - public void testAngleHatInPathValid() - { - String testname = "AngleHatInPathValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.xml. - */ - public void testAngleHatInPathInvalid() - { - String testname = "AngleHatInPathInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml. - */ - public void testAngleHatInFilenameValid() - { - String testname = "AngleHat^InFilenameValid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml. - */ - public void testAngleHatInFilenameInvalid() - { - String testname = "AngleHat^InFilenameInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("MarkupEntityMismatch"); - int numErrors = 1; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java deleted file mode 100644 index 9a8146b5d..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java +++ /dev/null @@ -1,136 +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.xml.validation.tests.internal; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Test; -import junit.framework.TestSuite; -/** - * Test class for the XML validator to test the XMLProject. - * - * @author Lawrence Mandel, IBM - */ -public class XMLExamplesTest extends BaseTestCase -{ - private static final String XMLExamples_DIR = "XMLExamples/"; - /** - * Create a tests suite from this test class. - * - * @return A test suite containing this test class. - */ - public static Test suite() - { - return new TestSuite(XMLExamplesTest.class); - } - - /** - * Test /XMLExamples/Invoice/Invoice.xml. - */ - public void testInvoice() - { - String testname = "Invoice"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "Invoice/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /XMLExamples/InvoiceRemote/Invoice.xml. - */ - public void testInvoiceRemote() - { - String testname = "Invoice"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceRemote/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /XMLExamples/InvoiceRemote/Invoice.xml. - */ - public void testInvoiceRemoteIndirect() - { - String testname = "InvoiceIndirect"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceRemote/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /XMLExamples/InvoiceInvalid/Invoice.xml. - */ - public void testInvoiceInvalid() - { - String testname = "Invoice"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "InvoiceInvalid/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("FILE_NOT_FOUND"); - int numErrors = 0; - int numWarnings = 1; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /XMLExamples/PublicationCatalogue/Catalogue.xml. - */ - public void testCatalogue() - { - String testname = "Catalogue"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "PublicationCatalogue/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /XMLExamples/PublicationCatalogueInvalid/Catalogue.xml. - */ - public void testCatalogueInvalid() - { - String testname = "CatalogueInvalid"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "PublicationCatalogueInvalid/" + testname + ".xml"; - List keys = new ArrayList(); - keys.add("FILE_NOT_FOUND"); - int numErrors = 0; - int numWarnings = 1; - - runTest(testfile, keys, numErrors, numWarnings); - } - - /** - * Test /XMLExamples/j2ee/web.xml. - */ - public void testWeb() - { - - String testname = "web"; - String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XMLExamples_DIR + "j2ee/" + testname + ".xml"; - List keys = new ArrayList(); - int numErrors = 0; - int numWarnings = 0; - - runTest(testfile, keys, numErrors, numWarnings); - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java deleted file mode 100644 index 76ee31d03..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java +++ /dev/null @@ -1,38 +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.xml.validation.tests.internal; - -import java.io.IOException; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Plugin; - -/** - * The plugin class for this test plugin. - */ -public class XMLValidatorTestsPlugin extends Plugin { - private static XMLValidatorTestsPlugin plugin = null; - - public XMLValidatorTestsPlugin() { - plugin = this; - } - - public static String getPluginLocation() throws IOException { - String file = FileLocator.resolve(plugin.getBundle().getEntry("/")).getFile(); - return new Path(file).removeTrailingSeparator().toString(); - } - - public static XMLValidatorTestsPlugin getPlugin() - { - return plugin; - } -} diff --git a/tests/org.eclipse.wst.xml.validation.tests/test.xml b/tests/org.eclipse.wst.xml.validation.tests/test.xml deleted file mode 100644 index 795fb1e02..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/test.xml +++ /dev/null @@ -1,96 +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.xml.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.xml.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.xml.validation.tests.internal.AllXMLTests" /> - </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.xml.validation.tests*.xml" /> - <property - name="output-file" - value="${plugin-name}.xml" /> - </ant> - </target> - -</project> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore deleted file mode 100644 index bb53574d6..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -generatedResults diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml deleted file mode 100644 index 4985c9aac..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INCOMPLETE/MSG_CONTENT_INCOMPLETE.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE root [ -<!ELEMENT root (child+)> -<!ELEMENT child (#PCDATA)> -]> -<root> -</root> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml deleted file mode 100644 index 0e1bd5279..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/MSG_CONTENT_INVALID/MSG_CONTENT_INVALID.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE root [ -<!ELEMENT root (child+)> -<!ELEMENT child (#PCDATA)> -]> -<root> -aaaa -</root> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd deleted file mode 100644 index 2e0f4d062..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/NoChildren.xsd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NoChildren" xmlns:tns="http://www.example.org/NoChildren"> - - <element name="MyElement" type="tns:NewXSDComplexType"></element> - - <complexType name="NewXSDComplexType"> - <sequence> - <element name="NewElement1" type="string" maxOccurs="unbounded" minOccurs="0"></element> - </sequence> - </complexType> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml deleted file mode 100644 index c805ecffb..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.3/cvc-complex-type.2.3.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tns:MyElement xmlns:tns="http://www.example.org/NoChildren" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/NoChildren NoChildren.xsd "> -aaaaa -</tns:MyElement> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd deleted file mode 100644 index ab01a09b8..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/NoChildren.xsd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NoChildren" xmlns:tns="http://www.example.org/NoChildren"> - - <element name="MyElement" type="tns:NewXSDComplexType"></element> - - <complexType name="NewXSDComplexType"> - <sequence> - <element name="NewElement1" type="string" maxOccurs="unbounded" minOccurs="1"></element> - </sequence> - </complexType> -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml deleted file mode 100644 index 3bbedb6b2..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/LineNumberAdjustments/cvc-complex-type.2.4.b/cvc-complex-type.2.4.b.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tns:MyElement xmlns:tns="http://www.example.org/NoChildren" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/NoChildren NoChildren.xsd "> - -</tns:MyElement> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml deleted file mode 100644 index 9ef6646f5..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml deleted file mode 100644 index bf35cb141..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd deleted file mode 100644 index 0737ba658..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!ELEMENT Invoice (Header,Item+)> -<!ELEMENT Header (Date,BillTo)> -<!ATTLIST Header - invoiceNumber CDATA #REQUIRED -> -<!ELEMENT Item (description*)> -<!ATTLIST Item - price CDATA #REQUIRED - discount (promotion | regular) "regular" -> -<!ELEMENT Date ((Month,Day,Year)|(Day,Month,Year))> -<!ELEMENT BillTo (Address)> -<!ATTLIST BillTo - custNumber ID #REQUIRED - name CDATA #IMPLIED - phone CDATA #IMPLIED -> -<!ELEMENT description (#PCDATA)> -<!ELEMENT Address (street1,street2?,city,(state|province),zip,country?)> -<!ELEMENT street1 (#PCDATA)> -<!ELEMENT street2 (#PCDATA)> -<!ELEMENT city (#PCDATA)> -<!ELEMENT state (#PCDATA)> -<!ELEMENT province (#PCDATA)> -<!ELEMENT zip (#PCDATA)> -<!ELEMENT country (#PCDATA)> -<!ELEMENT Month (#PCDATA)> -<!ELEMENT Day (#PCDATA)> -<!ELEMENT Year (#PCDATA)> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml deleted file mode 100644 index b79af27e3..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" > -<Invoice> - <Header invoiceNumber="12345"> - <Date> - <Month>July</Month> - <Day>15</Day> - <Year>2001</Year> - </Date> - <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414"> - <Address> - <street1>IBM</street1> - <street2>1150 Eglinton Ave East</street2> - <city>Toronto</city> - <state>Ontario</state> - <zip>M3C 1H7</zip> - <country>Canada</country> - </Address> - </BillTo> - </Header> - <Item discount="promotion" price="57"> - <description>high speed 3D graphics card</description> - </Item> -</Invoice> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml deleted file mode 100644 index b79af27e3..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" > -<Invoice> - <Header invoiceNumber="12345"> - <Date> - <Month>July</Month> - <Day>15</Day> - <Year>2001</Year> - </Date> - <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414"> - <Address> - <street1>IBM</street1> - <street2>1150 Eglinton Ave East</street2> - <city>Toronto</city> - <state>Ontario</state> - <zip>M3C 1H7</zip> - <country>Canada</country> - </Address> - </BillTo> - </Header> - <Item discount="promotion" price="57"> - <description>high speed 3D graphics card</description> - </Item> -</Invoice> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml deleted file mode 100644 index 15ba3ea07..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Invoice PUBLIC "InvoiceId" "http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd"> -<Invoice> - <Header invoiceNumber="12345"> - <Date> - <Month>July</Month> - <Day>15</Day> - <Year>2001</Year> - </Date> - <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414"> - <Address> - <street1>IBM</street1> - <street2>1150 Eglinton Ave East</street2> - <city>Toronto</city> - <state>Ontario</state> - <zip>M3C 1H7</zip> - <country>Canada</country> - </Address> - </BillTo> - </Header> - <Item discount="promotion" price="57"> - <description>high speed 3D graphics card</description> - </Item> -</Invoice> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml deleted file mode 100644 index f9e98744a..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE Invoice PUBLIC "InvoiceId" "http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd"> -<Invoice> - <Header invoiceNumber="12345"> - <Date> - <Month>July</Month> - <Day>15</Day> - <Year>2001</Year> - </Date> - <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414"> - <Address> - <street1>IBM</street1> - <street2>1150 Eglinton Ave East</street2> - <city>Toronto</city> - <state>Ontario</state> - <zip>M3C 1H7</zip> - <country>Canada</country> - </Address> - </BillTo> - </Header> - <Item discount="promotion" price="57"> - <description>high speed 3D graphics card</description> - </Item> -</Invoice> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml deleted file mode 100644 index 2749876b6..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue Catalogue.xsd "> - <c:Book> - <title>Professional XML Schema</title> - <date>2001</date> - <isbn>1-861005-47-4</isbn> - <publisher>Wrox Press</publisher> - </c:Book> - <c:Magazine> - <title>WebSphere Developer's Journal</title> - <date>2001</date> - </c:Magazine> - <c:Book> - <title>Java and XSLT</title> - <date>2001</date> - <isbn>0-596-00143-6</isbn> - <publisher>O'Reilly</publisher> - </c:Book> -</c:Catalogue> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd deleted file mode 100644 index d4ff9fd50..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://www.eclipse.org/webtools/Catalogue" xmlns:c="http://www.eclipse.org/webtools/Catalogue"> - - <complexType name="PublicationType"> - <sequence> - <element name="title" type="string"></element> - <element name="author" type="string" minOccurs="0" maxOccurs="unbounded"></element> - <element name="date" type="gYear"></element> - </sequence> - </complexType> - - <complexType name="BookType"> - <complexContent> - <extension base="c:PublicationType"> - <sequence> - <element name="isbn" type="string" /> - <element name="publisher" type="string"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="MagazineType"> - <complexContent> - <restriction base="c:PublicationType"> - <sequence> - <element name="title" type="string" /> - <element name="author" type="string" minOccurs="0" maxOccurs="0"/> - <element name="date" type="gYear"></element> - </sequence> - </restriction> - </complexContent> - </complexType> - - <element name="Publication" type="c:PublicationType" abstract="true"></element> - - <element name="Book" type="c:BookType" substitutionGroup="c:Publication"></element> - - <element name="Magazine" type="c:MagazineType" substitutionGroup="c:Publication"></element> - - <element name="Catalogue"> - <complexType> - <sequence> - <element ref="c:Publication" maxOccurs="unbounded"></element> - </sequence> - </complexType> - </element> - -</schema>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml deleted file mode 100644 index 2749876b6..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue Catalogue.xsd "> - <c:Book> - <title>Professional XML Schema</title> - <date>2001</date> - <isbn>1-861005-47-4</isbn> - <publisher>Wrox Press</publisher> - </c:Book> - <c:Magazine> - <title>WebSphere Developer's Journal</title> - <date>2001</date> - </c:Magazine> - <c:Book> - <title>Java and XSLT</title> - <date>2001</date> - <isbn>0-596-00143-6</isbn> - <publisher>O'Reilly</publisher> - </c:Book> -</c:Catalogue> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml deleted file mode 100644 index 8c60a4092..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - <display-name>module</display-name> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - <welcome-file>index.htm</welcome-file> - <welcome-file>index.jsp</welcome-file> - <welcome-file>default.html</welcome-file> - <welcome-file>default.htm</welcome-file> - <welcome-file>default.jsp</welcome-file> - </welcome-file-list> -</web-app> - diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml deleted file mode 100644 index 19e8db67c..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE example PUBLIC "Public Identifier" "http://www.eclipse.blah/non-existent-dtd.dtd"> -<example/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml deleted file mode 100644 index 421b8bca6..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE example PUBLIC "Public Identifier" "http://www.eclipse.org/webtools/non-existent-dtd.dtd"> -<example/>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml deleted file mode 100644 index e69de29bb..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml +++ /dev/null diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml deleted file mode 100644 index 089c88625..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoGrammar/NoGrammar.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root> - <child> - <child2/> - </child> -</root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml deleted file mode 100644 index 8099b2a05..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<root> - <noclosingtag> -</root>
\ No newline at end of file diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml deleted file mode 100644 index b4e44ef8d..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<root> - <test:test xmlns:test="http://test.org/test"> - </test:test> -</root> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml deleted file mode 100644 index 904d0a192..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE simple SYSTEM "simple.dtd"> - -<simple version="2.0" xmlns="http://www.simple.com/simple"> - <dummy> </dummy> -</simple> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml deleted file mode 100644 index e995d8bac..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="iso-8859-1"?> -<!DOCTYPE simple SYSTEM "simple.dtd"> - -<simple version="2.0" xmlns="http://www.simple.com/simple"> - <simple1> - <simple2/> - </simple1> -</simple> diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd deleted file mode 100644 index 2849b9724..000000000 --- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd +++ /dev/null @@ -1,7 +0,0 @@ -<!ELEMENT simple (simple1)> -<!ATTLIST simple - version CDATA #REQUIRED - xmlns CDATA #FIXED 'http://www.simple.com/simple' - > -<!ELEMENT simple1 (simple2)> -<!ELEMENT simple2 EMPTY>
\ No newline at end of file |