This commit was manufactured by cvs2svn to create tag 'v201204260100'.
diff --git a/features/org.eclipse.wst.web_tests.feature/.cvsignore b/features/org.eclipse.wst.web_tests.feature/.cvsignore
deleted file mode 100644
index 62260a4..0000000
--- a/features/org.eclipse.wst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_tests.feature_*.zip
diff --git a/features/org.eclipse.wst.web_tests.feature/.project b/features/org.eclipse.wst.web_tests.feature/.project
deleted file mode 100644
index 8d3270d..0000000
--- a/features/org.eclipse.wst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_tests.feature/build.properties b/features/org.eclipse.wst.web_tests.feature/build.properties
deleted file mode 100644
index 7c626e2..0000000
--- a/features/org.eclipse.wst.web_tests.feature/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- feature.properties
diff --git a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.properties b/features/org.eclipse.wst.web_tests.feature/feature.properties
deleted file mode 100644
index 53bfd4e..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=WST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-# license and licenseURL properties were removed as a result to migrating to new PDE license support.
-# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-# license and licenseURL properties were removed as a result to migrating to new PDE license support.
-# Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index f761bec..0000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="%featureName"
- version="3.4.0.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.license"
- license-feature-version="1.0.0.qualifier">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 7c626e2..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- feature.properties
diff --git a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.properties b/features/org.eclipse.wst.xml_tests.feature/feature.properties
deleted file mode 100644
index 741b874..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index fd388bd..0000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="%featureName"
- version="3.4.0.qualifier"
- provider-name="%providerName"
- license-feature="org.eclipse.license"
- license-feature-version="1.0.0.qualifier">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <plugin
- id="org.eclipse.wst.dtd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.dtd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.catalog.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath b/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d6..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.tests.encoding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.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.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 8784ffd..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.500.qualifier
-Bundle-ClassPath: jspencodingtests.jar
-Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.tests.encoding.jsp
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 42878d2..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-###############################################################################
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = jspencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = testfiles/,\
- test.xml
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
deleted file mode 100644
index 282073d..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jsp.tests.encoding
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = JSP Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 54097e0..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
- public static Test suite() {
- return new JSPEncodingTestSuite();
- }
-
- public JSPEncodingTestSuite() {
- super("JSP Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public JSPEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public JSPEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public JSPEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 7fdecd2..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.jst.jsp.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static JSPEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
-
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public JSPEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index 16777c1..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
- private boolean DEBUG = false;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- public JSPEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = JSPEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((JSPResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if throws exception.
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testdefect4205wpsjsp() throws IOException {
- String filename = fileLocation + "defect_4205_wps.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testJSPEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- /**
- * Caution, when this file prints out in console (when debug set to true,
- * it appears incorrect (due to font problems in console).
- */
- public void testUTF16() throws IOException {
- String filename = fileLocation + "testUTF16.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- * Note: UTF-16 == UTF-16BE
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16WithJapaneseChars() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.jsp";
- // [228366] Encoding changes: For UTF-16 with BOM, the expected should be UTF-16
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testXMLIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testXMLNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- public void testXMLNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.jsp";
- doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.jsp";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = fileLocation + "utf16BOM.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16leXmlStyle() throws IOException {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFileStream(filename, "UTF-16LE", new JSPResourceEncodingDetector());
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index 00ae800..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.StringTokenizer;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
- boolean DEBUG = false;
- private String fCharset;
- private String fContentType;
- private String fContentTypeValue;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
- private String fLanguage;
-
- private void doTestFile(String filename, String expectedName) throws Exception {
- doTestFile(filename, expectedName, null, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
- try {
- doTestFile(JSPEncodingTestsPlugin.getTestReader(filename), expectedName, finalTokenType, expectedContentType);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename +"\"");
- }
- }
-
- private void doTestFile(Reader fileReader, String expectedName, String finalTokenType, String expectedContentType) throws Exception {
- JSPHeadTokenizer tokenizer = null;
- tokenizer = new JSPHeadTokenizer(fileReader);
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
-
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
-
- String foundContentType = getContentType();
- if (expectedContentType == null) {
- assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
- }
- else {
- assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- public void testNormalNonDefault() throws Exception {
- String filename = fileLocation + "NormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8");
- }
-
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- private String getContentType() {
- return fContentType;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * This method should be exactly the same as what is in
- * JSPResourceEncodingDetector
- *
- * @param contentType
- */
- private void parseContentTypeValue(String contentType) {
- /*
- * Based partially on
- * org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapterImpl
- * .getMimeTypeFromContentTypeValue(String) , divides the full value
- * into segments according to ';', assumes the first specifies the
- * content type itself if it has no '=', and that the remainder are
- * parameters which may specify a charset
- */
-
- String cleanContentTypeValue = StringUtils.stripNonLetterDigits(contentType);
- /* Break the mime header into the main value and its parameters, separated by ';' */
- StringTokenizer tokenizer = new StringTokenizer(cleanContentTypeValue, ";"); //$NON-NLS-1$
- int tLen = tokenizer.countTokens();
- if (tLen == 0)
- return;
- String[] tokens = new String[tLen];
- int j = 0;
- while (tokenizer.hasMoreTokens()) {
- tokens[j] = tokenizer.nextToken();
- j++;
- }
-
- int firstParameter = 0;
- if (tokens[0].indexOf('=') == -1) {
- /*
- * no equal sign in the first segment, so assume it indicates a
- * content type properly
- */
- fContentType = tokens[0].trim();
- firstParameter = 1;
- }
- /*
- * now handle parameters as name=value pairs, looking for "charset"
- * specifically
- */
- Pattern equalPattern = Pattern.compile("\\s*=\\s*"); //$NON-NLS-1$
- for (int i = firstParameter; i < tokens.length; i++) {
- String[] pair = equalPattern.split(tokens[i]);
- if (pair.length < 2)
- continue;
- if (pair[0].trim().equals("charset")) { //$NON-NLS-1$
- fCharset = pair[1].trim();
- }
- }
-
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws Exception {
- fPageEncodingValue = null;
- fCharset = null;
- fContentType = null;
- fContentTypeValue = null;
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
-
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- else if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fXMLDecEncodingName = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fPageEncodingValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fContentTypeValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fLanguage = valueToken.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- if (fContentTypeValue != null) {
- parseContentTypeValue(fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws Exception {
- String filename = fileLocation + "nomalDirectiveCase.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testMinimalPageDirective() throws Exception {
- String filename = fileLocation + "minimalPageDirective.jsp";
- doTestFile(filename, null, null, "text/html");
- }
-
- public void testIllFormed() throws Exception {
- String filename = fileLocation + "testIllFormed.jsp";
- doTestFile(filename, null);
- }
-
- public void testIllFormed2() throws Exception {
- String filename = fileLocation + "testIllFormed2.jsp";
- doTestFile(filename, "UTF-8");
- }
-
- public void testIllformedNormalNonDefault() throws Exception {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8", null, "text/html");
- }
-
- public void testEmptyFile() throws Exception {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFile(filename, null);
- }
-
- public void testNomalDirectiveCaseUsingXMLSyntax() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirective() throws Exception {
- String filename = fileLocation + "testNoPageDirective.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalPageDirectiveWithXMLDecl() throws Exception {
- String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
- doTestFile(filename, "ISO-8859-1", null, "text/html");
- }
-
-
- public void testNoPageDirectiveAtFirst() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirectiveInLargeFile() throws Exception {
- String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
- }
-
- public void testNormalCaseWithNeither() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalCharset() throws Exception {
- String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
- doTestFile(filename, "ISO-8859-3", null, "text/html");
- }
-
- public void testUTF16le() throws Exception {
- String filename = fileLocation + "utf16le.jsp";
- doTestFile(filename, "UTF-16LE", null, "text/html");
- }
-
- public void testUTF16be() throws Exception {
- String filename = fileLocation + "utf16be.jsp";
- doTestFile(filename, "UTF-16BE", null, "text/html");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.zzRefill(JSPHeadTokenizer.java:359)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.primGetNextToken(JSPHeadTokenizer.java:598)
- at org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer.getNextToken(JSPHeadTokenizer.java:254)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.parseHeader(JSPHeadTokenizerTester.java:182)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.doTestFile(JSPHeadTokenizerTester.java:58)
- at org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester.testUTF16BOM(JSPHeadTokenizerTester.java:324)
- */
-
- public void testUTF16BOM() throws Exception {
- /*String filename = fileLocation + "utf16BOM.jsp";
- ZippedTest test = new ZippedTest();
- test.setUp();
- IFile file = test.getFile(filename);
- assertNotNull(file);
- Reader fileReader = new FileReader(file.getLocationURI().getPath());
- doTestFile(fileReader, "UTF-16", null, null);
- test.shutDown();*/
- }
-
- public void testUTF16leXmlStyle() throws Exception {
- String filename = fileLocation + "utf16le_xmlStyle.jsp";
- doTestFile(filename, "UTF-16LE", null, null);
- }
-
- public String getLanguage() {
- return fLanguage;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index a532152..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
- protected void doTest(String expectedContentType, String filePath, Class expectedException, String expectedJSPContentType) throws CoreException, IOException {
- super.doTest(expectedContentType, filePath, expectedException);
-
- IFile file = (IFile) getTestProject().findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
- IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
- IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
- String streamJSPContentType = (String) streamContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-
- checkResults(expectedJSPContentType, streamJSPContentType);
-
-
- String fileJSPContentType = (String) fileContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
- checkResults(expectedJSPContentType, fileJSPContentType);
-
-
- }
-
- private void checkResults(String expectedJSPContentType, String foundJSPContentType) {
- if (expectedJSPContentType == null) {
- assertTrue("expected no contentType, but found: " + foundJSPContentType, foundJSPContentType == null);
- }
- else {
- assertTrue("expected " + expectedJSPContentType + " but found " + foundJSPContentType, expectedJSPContentType.equals(foundJSPContentType));
- }
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null, "text/html");
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null, "text/html");
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null, "text/html");
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null, null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null, "text/html");
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null, null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null, null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null, "text/html");
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null, null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null, "text/html");
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null, null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null, "text/html");
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null, "text/html");
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null, null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null, "text/html");
- }
- public void nomalDirectiveCasewithXMLDecl() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp", null, "text/html");
- }
- public void testFile79() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null, "text/html");
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null, null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null, null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null, null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null, null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null, null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null, null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null, null);
- }
-
-
- public void testFile90() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null, "text/html");
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null, null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null, null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null, null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null, null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null, null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null, null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null, null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le.jsp", null, "text/html");
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16be.jsp", null, "text/html");
- }
-
- public void testFile105() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16BOM.jsp", null, null);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16le_xmlStyle.jsp", null, null);
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index 8ed692e..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e68..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cf..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 88dbd6f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次：<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e3..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
deleted file mode 100644
index f9a22b4..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html" %>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 7656902..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a08..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
deleted file mode 100644
index b1cb042..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-3"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c18..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3b..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e817..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
deleted file mode 100644
index 324c9fb..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e6916..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
deleted file mode 100644
index bb72378..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16be.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
deleted file mode 100644
index 4873cbe..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
deleted file mode 100644
index 5772f2f..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.core.tests/.classpath b/tests/org.eclipse.wst.css.core.tests/.classpath
deleted file mode 100644
index 35860be..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.classpath
+++ /dev/null
@@ -1,12 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
- <accessrules>
- <accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
- <accessrule kind="accessible" pattern="org/w3c/dom/stylesheets/**/*"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.core.tests/.cvsignore b/tests/org.eclipse.wst.css.core.tests/.cvsignore
deleted file mode 100644
index 9e9eed9..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-build.xml
-dev.properties
-temp.folder
-csscoretests.jar
-javaCompiler.csscoretests.jar.args
diff --git a/tests/org.eclipse.wst.css.core.tests/.project b/tests/org.eclipse.wst.css.core.tests/.project
deleted file mode 100644
index 34797db..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.css.core.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.css.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.css.core.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.css.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.css.core.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.css.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.css.core.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.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.css.core.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.css.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.css.core.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.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5f786d3..0000000
--- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.core.tests;singleton:=true
-Bundle-Version: 1.0.600.qualifier
-Bundle-ClassPath: csscoretests.jar
-Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.core.tests,
- org.eclipse.wst.css.core.tests.format,
- org.eclipse.wst.css.core.tests.format.testfiles,
- org.eclipse.wst.css.core.tests.model,
- org.eclipse.wst.css.core.tests.source,
- org.eclipse.wst.css.core.tests.testfiles,
- org.eclipse.wst.css.core.tests.testfiles.results,
- org.eclipse.wst.css.core.tests.util
-Require-Bundle: org.eclipse.wst.css.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit;bundle-version=3.8.2
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.css.core.tests/about.html b/tests/org.eclipse.wst.css.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.css.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties
deleted file mode 100644
index d5f3897..0000000
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 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
-###############################################################################
-bin.includes = test.xml,\
- csscoretests.jar,\
- src/,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- testfiles/
-jars.compile.order = csscoretests.jar
-source.csscoretests.jar = src/
-output.csscoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.properties b/tests/org.eclipse.wst.css.core.tests/plugin.properties
deleted file mode 100644
index 536fc72..0000000
--- a/tests/org.eclipse.wst.css.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.css.core.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = CSS Core Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
deleted file mode 100644
index a3c35cf..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2010 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.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.core.tests.format.TestCleanupProcessorCSS;
-import org.eclipse.wst.css.core.tests.format.TestFormatProcessorCSS;
-import org.eclipse.wst.css.core.tests.model.CSSCharsetRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFaceRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFamilyTest;
-import org.eclipse.wst.css.core.tests.model.CSSImportRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMediaRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMetaModelTest;
-import org.eclipse.wst.css.core.tests.model.CSSPageRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleSheetTest;
-import org.eclipse.wst.css.core.tests.model.TestCSSDecl;
-import org.eclipse.wst.css.core.tests.source.CSSSelectorTest;
-import org.eclipse.wst.css.core.tests.source.CSSSourceParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSTextParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSUrlTest;
-import org.eclipse.wst.css.core.tests.stylesheets.StyleSheetTest;
-import org.eclipse.wst.css.core.tests.testfiles.CSSModelLoadTest;
-
-
-public class CSSAllTests extends TestSuite {
- public static Test suite() {
- TestSuite suite = new TestSuite("SSE Model CSS Tests");
-
- addSourceTests(suite);
- addModelTests(suite);
-
- suite.addTestSuite(CSSCorePreferencesTest.class);
- suite.addTestSuite(StyleSheetTest.class);
- return suite;
- }
-
- private static void addSourceTests(TestSuite suite) {
- suite.addTestSuite(CSSSourceParserTest.class);
- suite.addTestSuite(CSSTextParserTest.class);
- suite.addTestSuite(CSSSelectorTest.class);
- suite.addTestSuite(CSSUrlTest.class);
- }
-
- private static void addModelTests(TestSuite suite) {
- suite.addTestSuite(CSSStyleSheetTest.class);
- suite.addTestSuite(CSSCharsetRuleTest.class);
- suite.addTestSuite(CSSImportRuleTest.class);
- suite.addTestSuite(CSSStyleRuleTest.class);
- suite.addTestSuite(CSSMediaRuleTest.class);
- suite.addTestSuite(CSSPageRuleTest.class);
- suite.addTestSuite(CSSFontFaceRuleTest.class);
- suite.addTestSuite(CSSFontFamilyTest.class);
- suite.addTestSuite(TestFormatProcessorCSS.class);
- suite.addTestSuite(TestCleanupProcessorCSS.class);
- suite.addTestSuite(TestCSSDecl.class);
- suite.addTestSuite(CSSModelLoadTest.class);
- suite.addTestSuite(CSSMetaModelTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
deleted file mode 100644
index 86ad6b8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.css.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class CSSCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, CSSCorePreferenceNames.INDENTATION_SIZE);
- bundleGetPreference(bundleName, CSSCorePreferenceNames.LINE_WIDTH);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, CSSCorePreferenceNames.CASE_IDENTIFIER, "2");
- pluginGetDefaultPreference(node, CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE);
- pluginSetPreferenceInt(node, CSSCorePreferenceNames.CASE_PROPERTY_NAME);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceInt(IEclipsePreferences node, String prefKey) {
- int originalValue = node.getInt(prefKey, -999);
- int expectedValue = -888;
- node.putInt(prefKey, expectedValue);
- int foundValue = node.getInt(prefKey, -999);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if (originalValue == -999)
- node.remove(prefKey);
- else
- node.putInt(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForCSS.ContentTypeID_CSS);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForCSS.ContentTypeID_CSS);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- CSSDocumentLoader loader = new CSSDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
deleted file mode 100644
index edb47a2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author pavery
- */
-public class CSSCoreTestSuite extends TestSuite {
-
- public static Test suite() {
- return new CSSCoreTestSuite();
- }
-
- public CSSCoreTestSuite() {
- super("CSS Core Tests");
-
- addTest(CSSAllTests.suite());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
deleted file mode 100644
index 19dc516..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSCoreTestsPlugin extends Plugin {
- // The shared instance.
- private static CSSCoreTestsPlugin plugin;
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public CSSCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.css.core.tests.CSSModelTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static CSSCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CSSCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java
deleted file mode 100644
index 2c17466..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/ProjectUtil.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.css.core.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-public class ProjectUtil {
-
- /**
- * Creates a simple project.
- *
- * @param name -
- * the name of the project
- * @param location -
- * the location of the project, or null if the default of
- * "/name" within the workspace is to be used
- * @param natureIds -
- * an array of natures IDs to set on the project, null if none
- * should be set
- * @return
- */
- public static IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-
- static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = CSSCoreTestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = CSSCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return file;
- }
-
- /**
- * @param rootEntry - avoid trailing separators
- * @param fullTargetPath
- */
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- /**
- *
- * @param entryname
- * path relative to TEST plugin starting w/ a "/" (eg.
- * "/testfiles/bugnumber/struts-logic.tld")
- * @param fullPath
- * path relative to junit test workpace (eg.
- * "/myruntimeproj/struts-logic.tld")
- * @return
- */
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(true);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return file[0];
- }
-
- public static IProject createProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
deleted file mode 100644
index 1e53c7f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 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.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestCleanupProcessorCSS extends TestCase {
- private static final String UTF_8 = "UTF-8";
- private StringCompareUtil fStringCompareUtil;
- private CleanupProcessorCSS fCleanupProcessor;
-
- private boolean fOldClearBlankLinesPref;
- private int fOldMaxLineWidthPref;
- private String fOldIndentationCharPref;
- private int fOldIndentationSizePref;
-
- protected void setUp() throws Exception {
- // set up preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
- fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
- fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
- fCleanupProcessor = new CleanupProcessorCSS();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- protected void tearDown() throws Exception {
- // restore old preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestCleanupProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- private void cleanupAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- fCleanupProcessor.cleanupModel(beforeModel);
-
- ByteArrayOutputStream cleanedupBytes = new ByteArrayOutputStream();
- beforeModel.save(cleanedupBytes); // "beforeModel" should now be
- // after the cleanup processor
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String cleanedupContents = new String(afterBytes.toByteArray(), UTF_8);
- String expectedContents = new String(cleanedupBytes.toByteArray(), UTF_8);
- assertTrue("Cleanup document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(cleanedupContents, expectedContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testBUG166909urlCaseCleanup() throws UnsupportedEncodingException, IOException, CoreException {
- // set up cleanup preferences for this test
- CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
- short oldCaseIdentifier = currentStrategy.getIdentCase();
- short oldCasePropertyName = currentStrategy.getPropNameCase();
- short oldCasePropertyValue = currentStrategy.getPropValueCase();
- short oldCaseSelector = currentStrategy.getSelectorTagCase();
- boolean oldFormatSource = currentStrategy.isFormatSource();
- boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
- currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setFormatSource(true);
- currentStrategy.setQuoteValues(false);
-
- cleanupAndAssertEquals("testfiles/bug166909-urlcase.css", "testfiles/bug166909-urlcase-cleaned.css");
-
- currentStrategy.setIdentCase(oldCaseIdentifier);
- currentStrategy.setPropNameCase(oldCasePropertyName);
- currentStrategy.setPropValueCase(oldCasePropertyValue);
- currentStrategy.setSelectorTagCase(oldCaseSelector);
- currentStrategy.setFormatSource(oldFormatSource);
- currentStrategy.setQuoteValues(oldFormatQuote);
- }
-
- public void testBug218993NoFormatCleanup() throws UnsupportedEncodingException, IOException, CoreException {
- // set up cleanup preferences for this test
- CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
- short oldCaseIdentifier = currentStrategy.getIdentCase();
- short oldCasePropertyName = currentStrategy.getPropNameCase();
- short oldCasePropertyValue = currentStrategy.getPropValueCase();
- short oldCaseSelector = currentStrategy.getSelectorTagCase();
- boolean oldFormatSource = currentStrategy.isFormatSource();
- boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
- currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
- currentStrategy.setFormatSource(false);
- currentStrategy.setQuoteValues(false);
-
- cleanupAndAssertEquals("testfiles/bug218993-noformat.css", "testfiles/bug218993-noformat-cleaned.css");
-
- currentStrategy.setIdentCase(oldCaseIdentifier);
- currentStrategy.setPropNameCase(oldCasePropertyName);
- currentStrategy.setPropValueCase(oldCasePropertyValue);
- currentStrategy.setSelectorTagCase(oldCaseSelector);
- currentStrategy.setFormatSource(oldFormatSource);
- currentStrategy.setQuoteValues(oldFormatQuote);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
deleted file mode 100644
index 44de2a7..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 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.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class TestFormatProcessorCSS extends TestCase {
- private static final String UTF_8 = "UTF-8";
- private StringCompareUtil fStringCompareUtil;
- private FormatProcessorCSS formatProcessor;
-
- private boolean fOldClearBlankLinesPref;
- private int fOldMaxLineWidthPref;
- private String fOldIndentationCharPref;
- private int fOldIndentationSizePref;
-
- public TestFormatProcessorCSS(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- // set up preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
- fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
- fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
- formatProcessor = new FormatProcessorCSS();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- protected void tearDown() throws Exception {
- // restore old preferences
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
- prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
- prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestFormatProcessorCSS)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- formatProcessor.formatModel(beforeModel);
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String formattedContents = new String(afterBytes.toByteArray(), UTF_8);
- String expectedContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(formattedContents, expectedContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testBUG73990SelectorFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/BUG73990_selector_unformatted.css", "testfiles/BUG73990_selector_formatted.css");
- }
-
- /**
- * Tests case when format would incorrectly add extra semicolons.
- *
- * @throws UnsupportedEncodingException
- * @throws IOException
- * @throws CoreException
- */
- public void testBUG111569extraSemicolonFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug111569-extrasemicolon.css", "testfiles/bug111569-extrasemicolon-formatted.css");
- }
-
- /**
- * Tests case when format would incorrectly add space between selector and
- * attribute selectors <code>input[type="hidden"]</code> would be
- * wrongly formatted as<code>input [type="hidden"]</code> instead of
- * being left alone.
- *
- * @throws UnsupportedEncodingException
- * @throws IOException
- * @throws CoreException
- */
- public void testBUG146198attributeSpecifierFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug146198-attributespecifier.css", "testfiles/bug146198-attributespecifier-formatted.css");
- }
-
- public void testBUG110539multipleClassFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug110539-multipleclass.css", "testfiles/bug110539-multipleclass-formatted.css");
- }
-
- public void testBUG248465combinedPseudoClass() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug248465-combined-pseudo-classes.css", "testfiles/bug248465-combined-pseudo-classes-fmt.css");
- }
-
- public void testBUG196476selectorPseudoclassesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug196476-selector-pseudo-classes.css", "testfiles/bug196476-selector-pseudo-classes-fmt.css");
- }
-
- /**
- * file should not change after format
- */
- public void testBUG163315SlashBeforePrimative1() throws UnsupportedEncodingException, IOException, CoreException {
- //
- formatAndAssertEquals("testfiles/bug163315-slash_before_primative_1.css", "testfiles/bug163315-slash_before_primative_1.css");
- }
-
- /**
- * space after / should be removed
- */
- public void testBUG163315SlashBeforePrimative2() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/bug163315-slash_before_primative_2.css", "testfiles/bug163315-slash_before_primative_1.css");
- }
-
- /**
- * Test case with two comments separated by whitespace. Make sure that the comments do not run together onto one line.
- */
- public void testCollapseWhitespaceBetweenComments() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/comments.css", "testfiles/comments-fmt.css");
- }
-
- /**
- * Test case with two comments separated by whitespace. Make sure that the comments do not run together onto one line.
- */
- public void testInlineComment() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/inline-comment.css", "testfiles/inline-comment-fmt.css");
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
deleted file mode 100644
index ff0ca70..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Class as selector */
-H1.pastoral {
- color: #00FF00
-}
-
-/* ID as selector */
-#z98y {
- letter-spacing: 0.3em
-}
-
-H1#z98y {
- letter-spacing: 0.5em
-}
-
-/* Contextual selectors */
-DIV P {
- font: small sans-serif
-}
-
-.reddish H1 {
- color: red
-}
-
-#x78y CODE {
- background: blue
-}
-
-DIV.sidenote H1 {
- font-size: large
-}
-
-/* Anchor pseudo-classes */
-A:link {
- color: red
-} /* unvisited link */
-A:visited {
- color: blue
-} /* visited links */
-A:active {
- color: lime
-} /* active links */
-
-/* Pseudo-class combined with normal class */
-A.external:visited {
- color: blue
-}
-
-/* 'first-line' pseudo-element */
-P:first-line {
- font-variant: small-caps
-}
-
-/* 'first-letter' pseudo-element */
-P:first-letter {
- font-size: 200%;
- float: left
-}
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter {
- color: purple
-}
-
-P.initial:first-letter {
- color: red
-}
-
-/* Multiple pseudo-elements */
-P {
- color: red;
- font-size: 12pt
-}
-
-P:first-letter {
- color: green;
- font-size: 200%
-}
-
-P:first-line {
- color: blue
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
deleted file mode 100644
index ed52c93..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Class as selector */
-H1.pastoral { color: #00FF00 }
-
-/* ID as selector */
-#z98y { letter-spacing: 0.3em }
-H1#z98y { letter-spacing: 0.5em }
-
-/* Contextual selectors */
-DIV P { font: small sans-serif }
-.reddish H1 { color: red }
-#x78y CODE { background: blue }
-DIV.sidenote H1 { font-size: large }
-
-/* Anchor pseudo-classes */
-A:link { color: red } /* unvisited link */
-A:visited { color: blue } /* visited links */
-A:active { color: lime } /* active links */
-
-/* Pseudo-class combined with normal class */
-A.external:visited { color: blue }
-
-/* 'first-line' pseudo-element */
-P:first-line { font-variant: small-caps }
-
-/* 'first-letter' pseudo-element */
-P:first-letter { font-size: 200%; float: left }
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter { color: purple }
-P.initial:first-letter { color: red }
-
-/* Multiple pseudo-elements */
-P { color: red; font-size: 12pt }
-P:first-letter { color: green; font-size: 200% }
-P:first-line { color: blue }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
deleted file mode 100644
index 537e7b5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
- color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
- color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
- border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
- border-top: 0px;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
deleted file mode 100644
index fe5073f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
-color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
-color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
-border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
-border-top: 0px;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
deleted file mode 100644
index c66e6e9..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.sitemaplev1 {
- font-family: Verdana;
- font-size: 12px;
- line-height: 17px;
- color: #666666;
- font-weight: bold;
- text-decoration: none;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
deleted file mode 100644
index c8e307d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.sitemaplev1{font-family:Verdana;font-size:12px;line-height:17px;
-color:#666666;font-weight:bold;
-text-decoration:none;}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
deleted file mode 100644
index 55ad1ca..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
- width: 98%;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
deleted file mode 100644
index 72c1dbd..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
-width: 98%;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css
deleted file mode 100644
index 8dd8380..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_1.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-.test {
- font: 11px/18px Verdana, Arial;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css
deleted file mode 100644
index 2ce3c75..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug163315-slash_before_primative_2.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-.test {
- font: 11px/ 18px Verdana, Arial;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
deleted file mode 100644
index 60dea46..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
- background: url(mixedCase/projectLogo.gif);
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
deleted file mode 100644
index dfd0aaa..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
- background: URL(mixedCase/projectLogo.gif);
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css
deleted file mode 100644
index d745f61..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes-fmt.css
+++ /dev/null
@@ -1,23 +0,0 @@
-#block:after {
- content: ".";
-}
-
-div.content #block:after {
- content: ".";
-}
-
-#block::after {
- content: ".";
-}
-
-div span.fix.clear {
- clear: both;
-}
-
-div span.fix.clear:after {
- content: both;
-}
-
-div:after {
- content: ".";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css
deleted file mode 100644
index a83df3f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug196476-selector-pseudo-classes.css
+++ /dev/null
@@ -1,6 +0,0 @@
-#block:after { content: "."; }
-div.content #block:after { content: "."; }
-#block::after {content: "."; }
-div span.fix.clear { clear: both; }
-div span.fix.clear:after { content: both; }
-div:after { content: "."; }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css
deleted file mode 100644
index 8ffc7c8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat-cleaned.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@charset "ISO-8859-1";
-
-/* Some kind of comment being left to the
-
- user */
-
-
-h {
- text-align: left;
- z-index: 2;
-}
-
-
-#CONTEXT {
- text-align: left;
- border: 1px solid black;
-
-
- }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css
deleted file mode 100644
index 2676801..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug218993-noformat.css
+++ /dev/null
@@ -1,19 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-/* Some kind of comment being left to the
-
- user */
-
-
-h {
- TEXT-ALIGN: LEFT;
- z-index: 2;
-}
-
-
-#CONTEXT {
- text-align: left;
- border: 1px solid black;
-
-
- }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css
deleted file mode 100644
index 336e6f4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes-fmt.css
+++ /dev/null
@@ -1,7 +0,0 @@
-a:focus:hover,div:focus:hover {
- background: white;
-}
-
-div a:focus:hover {
- background: blue;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css
deleted file mode 100644
index 401e096..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug248465-combined-pseudo-classes.css
+++ /dev/null
@@ -1,7 +0,0 @@
-a:focus:hover,div:focus:hover {
-background: white;
-}
-
-div a:focus:hover {
-background: blue;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments-fmt.css
deleted file mode 100644
index d3bdc22..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments-fmt.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-***************************************************
-* Foo
-* Bar
-*
-**********/
-
-/*************************
-
- Additional
-
-****************************************************/
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments.css
deleted file mode 100644
index 457addb..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/comments.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-***************************************************
-* Foo
-* Bar
-*
-**********/
-
-
-
-
-/*************************
-
- Additional
-
-****************************************************/
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/inline-comment-fmt.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/inline-comment-fmt.css
deleted file mode 100644
index 7a02908..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/inline-comment-fmt.css
+++ /dev/null
@@ -1,3 +0,0 @@
-a {
- text-decoration: /* underline */ none;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/inline-comment.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/inline-comment.css
deleted file mode 100644
index 0a2760b..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/inline-comment.css
+++ /dev/null
@@ -1,5 +0,0 @@
-a {
- text-decoration:
-
- /* underline */ none;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
deleted file mode 100644
index 433334a..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.Counter;
-import org.w3c.dom.css.RGBColor;
-import org.w3c.dom.css.Rect;
-
-public class AbstractModelTest extends TestCase {
- protected ICSSModel fModel = null;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
- prefs.setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, CSSCorePreferenceNames.LOWER);
- prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, CSSCorePreferenceNames.LOWER);
- prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, CSSCorePreferenceNames.LOWER);
-
- fModel = FileUtil.createModel();
- }
-
- protected void tearDown() throws Exception {
- if (fModel != null) {
- fModel.releaseFromEdit();
- fModel = null;
- }
- super.tearDown();
- }
-
- protected ICSSModel getModel() {
- return fModel;
- }
-
- protected ICSSStyleSheet getStyleSheet() {
- return (ICSSStyleSheet) fModel.getDocument();
- }
-
- class PrimitiveNumber {
- short type;
- float value;
-
- PrimitiveNumber(short newType, float newValue) {
- type = newType;
- value = newValue;
- }
- }
-
- class PrimitiveString {
- short type;
- String value;
-
- PrimitiveString(short newType, String newValue) {
- type = newType;
- value = newValue;
- }
- }
-
- /* for int, float */
- protected void checkPrimitiveNumber(CSSValue actual, PrimitiveNumber expected) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
- assertEquals(expected.value, ((CSSPrimitiveValue) actual).getFloatValue(expected.type), 0);
- }
-
- /* for string */
- protected void checkPrimitiveString(CSSValue actual, PrimitiveString expected) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
- assertEquals(expected.value, ((CSSPrimitiveValue) actual).getStringValue());
- }
-
- /* for counter */
- protected void checkPrimitiveCounter(CSSValue actual, String identifier, String listStyle, String separator) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_COUNTER, ((CSSPrimitiveValue) actual).getPrimitiveType());
- Counter counter = ((CSSPrimitiveValue) actual).getCounterValue();
- assertEquals(identifier, counter.getIdentifier());
- assertEquals(listStyle, counter.getListStyle());
- assertEquals(separator, counter.getSeparator());
- }
-
- /* for rect */
- protected void checkPrimitiveRect(CSSValue actual, Object[] expectedArray) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_RECT, ((CSSPrimitiveValue) actual).getPrimitiveType());
- Rect rect = ((CSSPrimitiveValue) actual).getRectValue();
- CSSPrimitiveValue value;
- Object expected;
- value = rect.getTop();
- expected = expectedArray[0];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getRight();
- expected = expectedArray[1];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getBottom();
- expected = expectedArray[2];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = rect.getLeft();
- expected = expectedArray[3];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- }
-
- /* for rgb */
- protected void checkPrimitiveRgb(CSSValue actual, Object[] expectedArray) {
- assertTrue(actual instanceof CSSPrimitiveValue);
- assertEquals(CSSPrimitiveValue.CSS_RGBCOLOR, ((CSSPrimitiveValue) actual).getPrimitiveType());
- RGBColor color = ((CSSPrimitiveValue) actual).getRGBColorValue();
- CSSPrimitiveValue value;
- Object expected;
- value = color.getRed();
- expected = expectedArray[0];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = color.getGreen();
- expected = expectedArray[1];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- value = color.getBlue();
- expected = expectedArray[2];
- if (expected instanceof PrimitiveNumber) {
- checkPrimitiveNumber(value, (PrimitiveNumber) expected);
- }
- else {
- checkPrimitiveString(value, (PrimitiveString) expected);
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
deleted file mode 100644
index dfb4abe..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSCharsetRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-public class CSSCharsetRuleTest extends AbstractModelTest {
- private final String RULE = "@charset \"iso-8859-1\";";
-
- public void testInsertRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSCharsetRule);
- CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
- assertEquals("iso-8859-1", charsetRule.getEncoding());
- assertEquals(RULE, charsetRule.getCssText());
- }
-
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- CSSCharsetRule newRule = doc.createCSSCharsetRule();
- newRule.setEncoding("iso-8859-1");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSCharsetRule);
- CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
- assertEquals("iso-8859-1", charsetRule.getEncoding());
- assertEquals(RULE, charsetRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
deleted file mode 100644
index babf772..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSFontFaceRuleTest extends AbstractModelTest {
- public void testInsertRule() {
- final String RULE = "@font-face { font-family: \"Swiss 721\"; src: url(swiss721.pfr); /* The expanded Swiss 721 */ font-stretch: expanded; }";
- CSSStyleSheet sheet = getStyleSheet();
- assertEquals(0, sheet.insertRule(RULE, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSFontFaceRule);
-
- CSSStyleDeclaration declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(3, declaration.getLength());
-
- CSSValue value;
- CSSPrimitiveValue primitiveValue;
-
- value = declaration.getPropertyCSSValue("font-family");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_STRING, primitiveValue.getPrimitiveType());
- assertEquals("Swiss 721", primitiveValue.getStringValue());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_URI, primitiveValue.getPrimitiveType());
- assertEquals("swiss721.pfr", primitiveValue.getStringValue());
-
- value = declaration.getPropertyCSSValue("font-stretch");
- assertTrue(value instanceof CSSPrimitiveValue);
-
- primitiveValue = (CSSPrimitiveValue) value;
- assertEquals(CSSPrimitiveValue.CSS_IDENT, primitiveValue.getPrimitiveType());
- assertEquals("expanded", primitiveValue.getStringValue());
- }
-
- public void _testInsertText1() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 1
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(4, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("font-family");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Swiss 721"));
-
- value = declaration.getPropertyCSSValue("src");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "swiss721blk.pfr"));
-
- value = declaration.getPropertyCSSValue("font-style");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 800));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 900));
- }
-
- public void _testInsertText2() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 2
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(6, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(9, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Palatino"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Times New Roman"));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(4), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "New York"));
- checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(6), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Utopia"));
- checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(8), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://somewhere/free/font"));
-
- value = declaration.getPropertyCSSValue("font-family");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(9, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 100));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 200));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
- checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
- checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
- value = declaration.getPropertyCSSValue("font-style");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
- value = declaration.getPropertyCSSValue("font-variant");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
- value = declaration.getPropertyCSSValue("font-size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "all"));
- }
-
- public void _testInsertText3() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 3
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
- assertTrue(rule instanceof CSSFontFaceRule);
-
- declaration = ((CSSFontFaceRule) rule).getStyle();
- assertEquals(5, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("src");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(4, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Alabama Italic"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.fonts.org/A/alabama-italic"));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truetype"));
-
- value = declaration.getPropertyCSSValue("panose-1");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(10, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(3), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(5), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
- checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
- checkPrimitiveNumber(valueList.item(7), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 9));
- checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
- checkPrimitiveNumber(valueList.item(9), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-
- value = declaration.getPropertyCSSValue("font-family");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Alabama"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
- value = declaration.getPropertyCSSValue("font-weight");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(5, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
- checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
- value = declaration.getPropertyCSSValue("font-style");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(3, valueList.getLength());
-
- checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
- checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
- checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "oblique"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java
deleted file mode 100644
index e6ce0d5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFamilyTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-
-public class CSSFontFamilyTest extends AbstractModelTest {
-
- private static final String FONT_FAMILY = "font-family";
-
- public void testFontFamilies() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFamilyTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList rules = sheet.getCssRules();
- assertEquals(4, rules.getLength());
-
- // Rule 1: No whitespace
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // Rule 1: No whitespace
- rule = rules.item(0);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Courier"));
-
- // Rule 2: Single whitespace
- rule = rules.item(1);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Courier New"));
-
- // Rule 3: In quotes
- rule = rules.item(2);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Courier New"));
-
- // Rule 4: Tabs and spaces all over
- rule = rules.item(3);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- value = declaration.getPropertyCSSValue(FONT_FAMILY);
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Comic Sans"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
deleted file mode 100644
index a22eb8d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSImportRuleTest extends AbstractModelTest {
-
- public void testInsertRuleDoubleQuote() {
- checkInsert("@import \"dummy.css\";", "dummy.css", null);
- }
-
- public void testInsertRuleSingleQuote() {
- checkInsert("@import \'dummy.css\';", "dummy.css", null);
- }
-
- public void testInsertRuleUrlNoQuote() {
- checkInsert("@import url(dummy.css);", "dummy.css", null);
- }
-
- public void testInsertRuleUrlDoubleQuote() {
- checkInsert("@import url(\"dummy.css\");", "dummy.css", null);
- }
-
- public void testInsertRuleUrlSingleQuote() {
- checkInsert("@import url(\'dummy.css\');", "dummy.css", null);
- }
-
- public void testInsertRuleMedia1() {
- checkInsert("@import url(\"dummy.css\") media1;", "dummy.css", new String[]{"media1"});
- }
-
- public void testInsertRuleMedia2() {
- checkInsert("@import url(\'dummy.css\') media1, media2;", "dummy.css", new String[]{"media1", "media2"});
- }
-
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- ICSSImportRule newRule = doc.createCSSImportRule();
- newRule.setHref("dummy.css");
- MediaList newList = newRule.getMedia();
- newList.appendMedium("media1");
- newList.appendMedium("media2");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSImportRule);
- CSSImportRule importRule = (CSSImportRule) rule;
- assertEquals("dummy.css", importRule.getHref());
- MediaList mediaList = importRule.getMedia();
- assertEquals(2, mediaList.getLength());
- assertEquals("media1", mediaList.item(0));
- assertEquals("media2", mediaList.item(1));
-
- assertEquals("@import url(\"dummy.css\") media1, media2;", importRule.getCssText());
- }
-
- private void checkInsert(String ruleString, String href, String[] media) {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(ruleString, 0));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSImportRule);
-
- CSSImportRule importRule = (CSSImportRule) rule;
- assertEquals(href, importRule.getHref());
-
- if (media != null) {
- assertEquals(media.length, importRule.getMedia().getLength());
- for (int i = 0; i < media.length; i++) {
- assertEquals(media[i], importRule.getMedia().item(i));
- }
- }
-
- assertEquals(ruleString, importRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
deleted file mode 100644
index 08f2840..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSMediaRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSMediaRuleTest extends AbstractModelTest {
- public void testCreateRule() {
- ICSSStyleSheet sheet = getStyleSheet();
- ICSSDocument doc = sheet;
- ICSSMediaRule newRule = doc.createCSSMediaRule();
- MediaList newList = newRule.getMedia();
- newList.appendMedium("media1");
- newList.appendMedium("media2");
- sheet.insertRuleBefore(newRule, null);
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule = ruleList.item(0);
- assertTrue(rule instanceof CSSMediaRule);
- CSSMediaRule mediaRule = (CSSMediaRule) rule;
-
- MediaList mediaList = mediaRule.getMedia();
- assertEquals(2, mediaList.getLength());
- assertEquals("media1", mediaList.item(0));
- assertEquals("media2", mediaList.item(1));
-
- assertEquals("@media media1, media2 {" + FileUtil.commonEOL + "}", mediaRule.getCssText());
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMetaModelTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMetaModelTest.java
deleted file mode 100644
index 0b5811c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMetaModelTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.css.core.tests.model;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contentmodel.IValID;
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil;
-
-public class CSSMetaModelTest extends TestCase {
-
- public void testContentPropertyValues2r1() {
- CSSMetaModel model = CSSProfileRegistry.getInstance().getDefaultProfile().getMetaModel();
- if (model != null) {
- CSSMetaModelUtil util = new CSSMetaModelUtil(model);
- CSSMMProperty property = util.getProperty(PropCMProperty.P_CONTENT);
- Iterator it = property.getValues();
- Set set = new HashSet(2);
- set.add(IValID.V_NORMAL);
- set.add(IValID.V_NONE);
- while (it.hasNext()) {
- CSSMMNode node = (CSSMMNode) it.next();
- if (set.contains(node.getName())) {
- assertEquals("Property should be a keyword", CSSMMNode.TYPE_KEYWORD, node.getType());
- set.remove(node.getName());
- }
- }
- assertTrue("The content property is missing values added for CSS 2 revision 1.", set.isEmpty());
- }
- }
-
- public void testCursorPropertyValues2r1() {
- CSSMetaModel model = CSSProfileRegistry.getInstance().getDefaultProfile().getMetaModel();
- if (model != null) {
- CSSMetaModelUtil util = new CSSMetaModelUtil(model);
- CSSMMProperty property = util.getProperty(PropCMProperty.P_CURSOR);
- Iterator it = property.getValues();
- Set set = new HashSet(1);
- set.add(IValID.V_PROGRESS);
- while (it.hasNext()) {
- CSSMMNode node = (CSSMMNode) it.next();
- if (set.contains(node.getName())) {
- assertEquals("Property should be a keyword", CSSMMNode.TYPE_KEYWORD, node.getType());
- set.remove(node.getName());
- }
- }
- assertTrue("The content property is missing values added for CSS 2 revision 1.", set.isEmpty());
- }
- }
-
- public void testDisplayPropertyValues2r1() {
- CSSMetaModel model = CSSProfileRegistry.getInstance().getDefaultProfile().getMetaModel();
- if (model != null) {
- CSSMetaModelUtil util = new CSSMetaModelUtil(model);
- CSSMMProperty property = util.getProperty(PropCMProperty.P_DISPLAY);
- Iterator it = property.getValues();
- Set set = new HashSet(1);
- set.add(IValID.V_INLINE_BLOCK);
- while (it.hasNext()) {
- CSSMMNode node = (CSSMMNode) it.next();
- if (set.contains(node.getName())) {
- assertEquals("Property should be a keyword", CSSMMNode.TYPE_KEYWORD, node.getType());
- set.remove(node.getName());
- }
- }
- assertTrue("The content property is missing values added for CSS 2 revision 1.", set.isEmpty());
- }
- }
-
- public void testWhitespacePropertyValues2r1() {
- CSSMetaModel model = CSSProfileRegistry.getInstance().getDefaultProfile().getMetaModel();
- if (model != null) {
- CSSMetaModelUtil util = new CSSMetaModelUtil(model);
- CSSMMProperty property = util.getProperty(PropCMProperty.P_WHITE_SPACE);
- Iterator it = property.getValues();
- Set set = new HashSet(1);
- set.add(IValID.V_PRE_LINE);
- set.add(IValID.V_PRE_WRAP);
- while (it.hasNext()) {
- CSSMMNode node = (CSSMMNode) it.next();
- if (set.contains(node.getName())) {
- assertEquals("Property should be a keyword", CSSMMNode.TYPE_KEYWORD, node.getType());
- set.remove(node.getName());
- }
- }
- assertTrue("The content property is missing values added for CSS 2 revision 1.", set.isEmpty());
- }
- }
-
- public void testColorPropertyValues2r1() {
- CSSMetaModel model = CSSProfileRegistry.getInstance().getDefaultProfile().getMetaModel();
- if (model != null) {
- CSSMetaModelUtil util = new CSSMetaModelUtil(model);
- CSSMMProperty property = util.getProperty(PropCMProperty.P_COLOR);
- Iterator it = property.getValues();
- Set set = new HashSet(1);
- set.add(IValID.V_ORANGE);
- while (it.hasNext()) {
- CSSMMNode node = (CSSMMNode) it.next();
- if (set.contains(node.getName())) {
- assertEquals("Property should be a keyword", CSSMMNode.TYPE_KEYWORD, node.getType());
- set.remove(node.getName());
- }
- }
- assertTrue("The content property is missing values added for CSS 2 revision 1.", set.isEmpty());
- }
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
deleted file mode 100644
index 429bc02..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPageRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSPageRuleTest extends AbstractModelTest {
- public void testInsertText1() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 1
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(2, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, (float) 8.5));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 11));
-
- value = declaration.getPropertyCSSValue("margin");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 2));
- }
-
- public void testInsertText2() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 2
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "auto"));
-
- value = declaration.getPropertyCSSValue("margin");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 10));
- }
-
- public void testInsertText3() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 3
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals(":left", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("margin-left");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-
- value = declaration.getPropertyCSSValue("margin-right");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
- }
-
- public void testInsertText4() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 4
-
- rule = ruleList.item(3);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals(":right", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(2, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("margin-left");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-
- value = declaration.getPropertyCSSValue("margin-right");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
- }
-
- public void testInsertText5() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
- CSSValueList valueList;
-
- // rule 5
-
- rule = ruleList.item(4);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals("narrow", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(1, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- assertTrue(value instanceof CSSValueList);
-
- valueList = (CSSValueList) value;
- assertEquals(2, valueList.getLength());
-
- checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 9));
- checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 18));
- }
-
- public void testInsertText6() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(6, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- // rule 6
-
- rule = ruleList.item(5);
- assertEquals(CSSRule.PAGE_RULE, rule.getType());
- assertTrue(rule instanceof CSSPageRule);
-
- assertEquals("rotated", ((CSSPageRule) rule).getSelectorText());
-
- declaration = ((CSSPageRule) rule).getStyle();
- assertEquals(1, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("size");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "landscape"));
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
deleted file mode 100644
index 589662e..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSStyleRuleTest extends AbstractModelTest {
- public void testInsertTextNumbers() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(0);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(20, declaration.getLength());
-
- // 01
- value = declaration.getPropertyCSSValue("NUMBER");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_NUMBER, 123.456f));
-
- // 02
- value = declaration.getPropertyCSSValue("PERCENTAGE");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 123.456f));
-
- // 03
- value = declaration.getPropertyCSSValue("EMS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EMS, 123.456f));
-
- // 04
- value = declaration.getPropertyCSSValue("EXS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EXS, 123.456f));
-
- // 05
- value = declaration.getPropertyCSSValue("PX");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, +123.456f));
- value = declaration.getPropertyCSSValue("PX2");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, -123f));
-
-
-
- // 06
- value = declaration.getPropertyCSSValue("CM");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 123.456f));
-
- // 07
- value = declaration.getPropertyCSSValue("MM");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MM, 123.456f));
-
- // 08
- value = declaration.getPropertyCSSValue("IN");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 123.456f));
-
- // 09
- value = declaration.getPropertyCSSValue("PT");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PT, 123.456f));
-
- // 10
- value = declaration.getPropertyCSSValue("PC");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PC, 123.456f));
-
- // 11
- value = declaration.getPropertyCSSValue("DEG");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DEG, -123.456f));
-
- // 12
- value = declaration.getPropertyCSSValue("RAD");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_RAD, 123.456f));
-
- // 13
- value = declaration.getPropertyCSSValue("GRAD");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_GRAD, 123.456f));
-
- // 14
- value = declaration.getPropertyCSSValue("MS");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MS, 123.456f));
-
- // 15
- value = declaration.getPropertyCSSValue("S");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_S, 123.456f));
-
- // 16
- value = declaration.getPropertyCSSValue("HZ");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_HZ, 123.456f));
-
- // 17
- value = declaration.getPropertyCSSValue("KHZ");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_KHZ, 123.456f));
-
- // 18
- value = declaration.getPropertyCSSValue("DIMENSION");
- checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DIMENSION, -123.456f));
-
- // 19
- value = declaration.getPropertyCSSValue("INTEGER");
- checkPrimitiveNumber(value, new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 123));
- }
-
- public void testInsertTextStrings() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(1);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(11, declaration.getLength());
-
- // 01
- value = declaration.getPropertyCSSValue("STRING");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "string"));
-
- // 02
- value = declaration.getPropertyCSSValue("URI");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.ibm.com/"));
-
- // 03
- value = declaration.getPropertyCSSValue("IDENT");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "left"));
-
- // 04
- value = declaration.getPropertyCSSValue("HASH");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_HASH, "#abcdef"));
-
- // 05
- value = declaration.getPropertyCSSValue("URANGE");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_URANGE, "U+20A7"));
-
- // 06
- value = declaration.getPropertyCSSValue("SLASH");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_SLASH, "/"));
-
- // 07
- value = declaration.getPropertyCSSValue("COMMA");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-
- // 08
- value = declaration.getPropertyCSSValue("INHERIT_PRIMITIVE");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE, "inherit"));
-
- // 09
- value = declaration.getPropertyCSSValue("ATTR");
- checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_ATTR, "KEY"));
-
- // 10
- value = declaration.getPropertyCSSValue("FORMAT");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truedoc"));
-
- // 11
- value = declaration.getPropertyCSSValue("LOCAL");
- checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Excelsior Roman"));
- }
-
- public void testInsertTextFunctions() throws IOException {
- ICSSModel model = getModel();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
- CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
- CSSRuleList ruleList = sheet.getCssRules();
- assertEquals(3, ruleList.getLength());
-
- CSSRule rule;
- CSSStyleDeclaration declaration;
- CSSValue value;
-
- rule = ruleList.item(2);
- assertEquals(CSSRule.STYLE_RULE, rule.getType());
- assertTrue(rule instanceof CSSStyleRule);
-
- declaration = ((CSSStyleRule) rule).getStyle();
- assertEquals(3, declaration.getLength());
-
- value = declaration.getPropertyCSSValue("COUNTER");
- checkPrimitiveCounter(value, "par-num", "upper-roman", null);
-
- value = declaration.getPropertyCSSValue("RECT");
- checkPrimitiveRect(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 12), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 34), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 56), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 78)});
-
- value = declaration.getPropertyCSSValue("RGBCOLOR");
- checkPrimitiveRgb(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 255), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 128), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 0)});
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
deleted file mode 100644
index c23ceb4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.core.tests.model;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-public class CSSStyleSheetTest extends AbstractModelTest {
- private final static String RULE_H1 = "H1 { color : red; }";
- private final static String RULE_H2 = "H2 { color : red; }";
- private final static String RULE_H3 = "H3 { color : red; }";
-
- public void testInsertRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE_H3, 0));
- assertEquals(0, sheet.insertRule(RULE_H1, 0));
- assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
- CSSRuleList ruleList = sheet.getCssRules();
- CSSRule rule;
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
- rule = ruleList.item(1);
- assertEquals(RULE_H2, rule.getCssText());
- rule = ruleList.item(2);
- assertEquals(RULE_H3, rule.getCssText());
-
- }
-
- public void testDeleteRule() {
- CSSStyleSheet sheet = getStyleSheet();
-
- assertEquals(0, sheet.insertRule(RULE_H3, 0));
- assertEquals(0, sheet.insertRule(RULE_H1, 0));
- assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
- CSSRuleList ruleList;
- CSSRule rule;
-
- sheet.deleteRule(1);
- ruleList = sheet.getCssRules();
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
- rule = ruleList.item(1);
- assertEquals(RULE_H3, rule.getCssText());
-
- sheet.deleteRule(1);
- ruleList = sheet.getCssRules();
-
- rule = ruleList.item(0);
- assertEquals(RULE_H1, rule.getCssText());
-
- sheet.deleteRule(0);
-
- try {
- sheet.deleteRule(0);
- }
- catch (DOMException e) {
- assertEquals(DOMException.INDEX_SIZE_ERR, e.code);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
deleted file mode 100644
index e6fc9ae..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.util.CSSStyleDeclarationFactory;
-import org.eclipse.wst.css.core.internal.util.declaration.CSSPropertyContext;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class TestCSSDecl extends TestCase {
- // commenting out this test because decl.setCssText() is not an implemented method
-// public void testDecl() {
-// CSSPropertyContext context = new CSSPropertyContext();
-// ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
-// context.initialize(decl);
-// decl.setCssText(getString() != null ? getString() : "");//$NON-NLS-1$
-// }
-// private String getString() {
-// return "body {}";
-// }
-
- public void testStandaloneCSSDecl() {
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=202615
- CSSPropertyContext context = new CSSPropertyContext();
- ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
- context.initialize(decl);
- String cssText = decl.getCssText();
- assertEquals("standalone css node was not initialized", "", cssText); //$NON-NLS-1$ //$NON-NLS-2$
-
- context.setMargin("auto"); //$NON-NLS-1$
- context.setColor("red"); //$NON-NLS-1$
- context.setBorder("thick"); //$NON-NLS-1$
- context.applyFull(decl);
- cssText = decl.getCssText();
- String expected = "color: red; border: thick; margin: auto"; //$NON-NLS-1$
- assertEquals("standalone css node's properties were not set as expected", expected, cssText); //$NON-NLS-1$
- }
-
- public void testCSSStyleDeclItem() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSStyleDeclItemMODE_DECLARATION() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSStyleDeclItemSTYLE_SHEET() {
- String value = "color: blue;";
- IDocumentLoader loader = new CSSDocumentLoader();
- IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
- ((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_STYLESHEET);
-
- sharedStructuredDocument.set(value);
-
- IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
-
- }
-
- public void testCSSModel() {
-
- ICSSModel model = FileUtil.createModel();
-
- try {
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(getHTMLDocumentText());
-
- IStructuredDocumentRegion region = structuredDocument.getFirstStructuredDocumentRegion();
- assertNotNull(region);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- /**
- * To test https://bugs.eclipse.org/298111
- */
- public void testInsertPropertyInExistingRule() {
- ICSSModel model = FileUtil.createModel();
- try {
- String originalDocument =
- "@CHARSET \"ISO-8859-1\";\r\n" +
- ".test {\r\n" +
- "}";
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- structuredDocument.set(originalDocument);
-
- IndexedRegion indexedRegion = model.getIndexedRegion(28);
- assertTrue("Indexed region should be an ICSSStyleRule", indexedRegion instanceof ICSSStyleRule);
- ICSSStyleRule rule = (ICSSStyleRule)indexedRegion;
- ICSSStyleDeclaration declaration = (ICSSStyleDeclaration)rule.getStyle();
- declaration.setProperty("color", "#008040", null);
- CSSPropertyContext context = new CSSPropertyContext(declaration);
- context.applyModified(declaration);
- String newDocument = structuredDocument.get();
- String expectedNewDocument =
- "@CHARSET \"ISO-8859-1\";\r\n" +
- ".test {\r\n" +
- "\tcolor: #008040\r\n" +
- "}";
-
- assertEquals("The updated CSS document does not equal the expected", expectedNewDocument, newDocument);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private String getHTMLDocumentText() {
- String text = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n" +
- "<HTML><HEAD>\r\n" +
- "<META http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\r\n" +
- "<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\r\n" +
- "<TITLE></TITLE>\r\n" +
- "<STYLE type=\"text/css\">\r\n" +
- "<!--\r\n" +
- "BODY{\r\n" +
- " color : teal;\r\n" +
- " background-color: #FFFF99;\r\n" +
- "}\r\n" +
- "H1{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 10px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 10px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "H2{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 7px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 7px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "H3{\r\n" +
- " color : teal;\r\n" +
- " text-align: center;\r\n" +
- " padding-top: 4px;\r\n" +
- " padding-right: 0px;\r\n" +
- " padding-bottom: 4px;\r\n" +
- " padding-left: 0px;\r\n" +
- " border-top-style : solid;\r\n" +
- " border-top-color : teal;\r\n" +
- "}\r\n" +
- "HR{\r\n" +
- " color : teal;\r\n" +
- " height: 3px;\r\n" +
- "}\r\n" +
- "P{\r\n" +
- " color : teal;\r\n" +
- "}\r\n" +
- "TH{\r\n" +
- " color: #FFFFCC;\r\n" +
- " background-color : teal;\r\n" +
- "}\r\n" +
- "TD{\r\n" +
- " color : black;\r\n" +
- " background-color : white;\r\n" +
- "}\r\n" +
- "-->\r\n" +
- "</STYLE>\r\n" +
- "</HEAD><BODY>\r\n" +
- "<H1>Heading 1 Heading 1</H1>\r\n" +
- "<H2>Heading 2 Heading 2</H2>\r\n" +
- "<H3>Heading 3 Heading 3</H3>\r\n" +
- "<HR>\r\n" +
- "<P>Normal Text</P>\r\n" +
- "<P style=\"color : white; background-color : teal;\">Normal Text with inline style</P>\r\n" +
- "<HR>\r\n" +
- "<TABLE border=\"1\">\r\n" +
- " <TBODY>\r\n" +
- " <TR>\r\n" +
- " <TH colspan=\"3\">Header Cell of Table</TH>\r\n" +
- " </TR>\r\n" +
- " <TR>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " </TR>\r\n" +
- " <TR>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " <TD>Data Cell of Table</TD>\r\n" +
- " </TR>\r\n" +
- " </TBODY>\r\n" +
- "</TABLE>\r\n" +
- "</BODY></HTML>";
- return text;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
deleted file mode 100644
index 3d643d2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
+++ /dev/null
@@ -1,858 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 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.css.core.tests.source;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-public class CSSSelectorTest extends TestCase {
- public void testSelector01() {
- ICSSSelectorList list = createSelectorList("H1, H2, H3");
- checkSelectorList(list, "H1, H2, H3", 3, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H2", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-
- selector = list.getSelector(2);
- checkSelector(selector, "H3", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
- }
-
- // see 214416 Dot char is not escaped in XML10Names.jFlex
- // for complications leading to this test being changed.
- public void testSelector02() {
- ICSSSelectorList list = createSelectorList("H\\\\, H\\1, H3");
- checkSelectorList(list, "H\\\\, H\\1, H3", 3, 2);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H\\\\", 1, 1, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\\\", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H\\1", 1, 1, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\1", false, 0, 0, 0, 0);
-
- selector = list.getSelector(2);
- checkSelector(selector, "H3", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
- }
-
- public void testSelector03() {
- ICSSSelectorList list = createSelectorList("H1.pastoral");
- checkSelectorList(list, "H1.pastoral", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.pastoral", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"pastoral"});
- }
-
- public void testSelector04() {
- ICSSSelectorList list = createSelectorList("P.pastoral.marine");
- checkSelectorList(list, "P.pastoral.marine", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P.pastoral.marine", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"pastoral", "marine"});
- }
-
- public void testSelector05() {
- ICSSSelectorList list = createSelectorList("*.warning");
- checkSelectorList(list, "*.warning", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.warning", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"warning"});
- }
-
- public void testSelector06() {
- ICSSSelectorList list = createSelectorList(".warning");
- checkSelectorList(list, ".warning", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".warning", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"warning"});
- }
-
- public void testSelector07() {
- ICSSSelectorList list = createSelectorList("*[lang=fr]");
- checkSelectorList(list, "*[lang=fr]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*[lang=fr]", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
- }
-
- public void testSelector08() {
- ICSSSelectorList list = createSelectorList("[lang=fr]");
- checkSelectorList(list, "[lang=fr]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "[lang=fr]", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
- }
-
- public void testSelector09() {
- ICSSSelectorList list = createSelectorList("*#myid");
- checkSelectorList(list, "*#myid", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*#myid", 1, 10000, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"myid"});
- }
-
- public void testSelector10() {
- ICSSSelectorList list = createSelectorList("#myid");
- checkSelectorList(list, "#myid", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "#myid", 1, 10000, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"myid"});
- }
-
- public void testSelector11() {
- ICSSSelectorList list = createSelectorList("H1#z98y");
- checkSelectorList(list, "H1#z98y", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1#z98y", 1, 10001, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"z98y"});
- }
-
- public void testSelector12() {
- ICSSSelectorList list = createSelectorList("H1 EM");
- checkSelectorList(list, "H1 EM", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1 EM", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
- }
-
- public void testSelector13() {
- ICSSSelectorList list = createSelectorList("DIV * P");
- checkSelectorList(list, "DIV * P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV * P", 5, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector14() {
- ICSSSelectorList list = createSelectorList("DIV P *[href]");
- checkSelectorList(list, "DIV P *[href]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV P *[href]", 5, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"href"});
- }
-
- public void testSelector15() {
- ICSSSelectorList list = createSelectorList("BODY > P");
- checkSelectorList(list, "BODY > P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "BODY > P", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "BODY", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector16() {
- ICSSSelectorList list = createSelectorList("DIV OL>LI P");
- checkSelectorList(list, "DIV OL > LI P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV OL > LI P", 7, 4, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "OL", false, 0, 0, 0, 0);
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "LI", false, 0, 0, 0, 0);
-
- item = selector.getItem(5);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(6);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector17() {
- ICSSSelectorList list = createSelectorList("MATH + P");
- checkSelectorList(list, "MATH + P", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "MATH + P", 3, 2, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "MATH", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
- }
-
- public void testSelector18() {
- ICSSSelectorList list = createSelectorList("H1.opener + H2");
- checkSelectorList(list, "H1.opener + H2", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.opener + H2", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"opener"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
- }
-
- public void testSelector19() {
- ICSSSelectorList list = createSelectorList("EXAMPLE[notation=decimal]");
- checkSelectorList(list, "EXAMPLE[notation=decimal]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "EXAMPLE[notation=decimal]", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "EXAMPLE", false, 1, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"notation=decimal"});
- }
-
- public void testSelector20() {
- ICSSSelectorList list = createSelectorList("SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]");
- checkSelectorList(list, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "SPAN", false, 2, 0, 0, 0);
- checkSimpleSelectorAttributes(item, new String[]{"hello=\"Cleveland\"", "goodbye=\"Columbus\""});
- }
-
- public void testSelector21() {
- ICSSSelectorList list = createSelectorList("DIV > P:first-child");
- checkSelectorList(list, "DIV > P:first-child", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "DIV > P:first-child", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
- }
-
- public void testSelector22() {
- ICSSSelectorList list = createSelectorList("P:first-child EM");
- checkSelectorList(list, "P:first-child EM", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P:first-child EM", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
- }
-
- public void testSelector23() {
- ICSSSelectorList list = createSelectorList("* > A:first-child");
- checkSelectorList(list, "* > A:first-child", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "* > A:first-child", 3, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
- }
-
- public void testSelector24() {
- ICSSSelectorList list = createSelectorList("A:link");
- checkSelectorList(list, "A:link", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "A:link", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
- }
-
- public void testSelector25() {
- ICSSSelectorList list = createSelectorList(":link");
- checkSelectorList(list, ":link", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ":link", 1, 100, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
- }
-
- public void testSelector26() {
- ICSSSelectorList list = createSelectorList("A:focus:hover");
- checkSelectorList(list, "A:focus:hover", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "A:focus:hover", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 2);
- checkSimpleSelectorPseudoNames(item, new String[]{"focus", "hover"});
- }
-
- public void testSelector27() {
- ICSSSelectorList list = createSelectorList("HTML:lang(de) > Q");
- checkSelectorList(list, "HTML:lang(de) > Q", 1, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "HTML:lang(de) > Q", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "HTML", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"lang(de)"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "Q", false, 0, 0, 0, 0);
- }
-
- public void testSelector28() {
- ICSSSelectorList list = createSelectorList("P > A:link, A.external:visited");
- checkSelectorList(list, "P > A:link, A.external:visited", 2, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P > A:link", 3, 102, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "A.external:visited", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
- checkSimpleSelectorClasses(item, new String[]{"external"});
- checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
- }
-
- public void testSelector29() {
- ICSSSelectorList list = createSelectorList("P#hoge98 + *:hover > A:link, A.external:visited");
- checkSelectorList(list, "P#hoge98 + *:hover > A:link, A.external:visited", 2, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P#hoge98 + *:hover > A:link", 5, 10202, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[]{"hoge98"});
-
- item = selector.getItem(1);
- checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
- item = selector.getItem(2);
- checkSimpleSelector(item, "*", true, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"hover"});
-
- item = selector.getItem(3);
- checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
- item = selector.getItem(4);
- checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
- checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "A.external:visited", 1, 201, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
- checkSimpleSelectorClasses(item, new String[]{"external"});
- checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
- }
-
- public void testSelector30() {
- ICSSSelectorList list = createSelectorList("H1.123");
- checkSelectorList(list, "H1.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.123", 1, 101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector31() {
- ICSSSelectorList list = createSelectorList("P.123.456");
- checkSelectorList(list, "P.123.456", 1, 2);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "P.123.456", 1, 201, 2);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123", "456"});
- }
-
- public void testSelector32() {
- ICSSSelectorList list = createSelectorList("*.123");
- checkSelectorList(list, "*.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector33() {
- ICSSSelectorList list = createSelectorList(".123");
- checkSelectorList(list, ".123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector34() {
- ICSSSelectorList list = createSelectorList("H1.1x3");
- checkSelectorList(list, "H1.1x3", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H1.1x3", 1, 101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"1x3"});
- }
-
- public void testSelector35() {
- ICSSSelectorList list = createSelectorList("H2.123#46");
- checkSelectorList(list, "H2.123#46", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H2.123#46", 1, 10101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H2", false, 0, 1, 1, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- checkSimpleSelectorIDs(item, new String[]{"46"});
- }
-
- public void testSelector36() {
- ICSSSelectorList list = createSelectorList("H3.1x3#4t2");
- checkSelectorList(list, "H3.1x3#4t2", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H3.1x3#4t2", 1, 10101, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H3", false, 0, 1, 1, 0);
- checkSimpleSelectorClasses(item, new String[]{"1x3"});
- checkSimpleSelectorIDs(item, new String[]{"4t2"});
- }
-
- public void testSelector37() {
- ICSSSelectorList list = createSelectorList("*.123");
- checkSelectorList(list, "*.123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "*.123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector38() {
- ICSSSelectorList list = createSelectorList(".123");
- checkSelectorList(list, ".123", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123"});
- }
-
- public void testSelector39() {
- ICSSSelectorList list = createSelectorList(".123f567");
- checkSelectorList(list, ".123f567", 1, 1);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, ".123f567", 1, 100, 1);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "", true, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[]{"123f567"});
- }
-
- // Bug 221504: whitespace preceding a selector separator was causing selectors
- // to be merged
- public void testSelector40() {
- ICSSSelectorList list = createSelectorList("h1.fix , h2.fix, h3.fix , div#container");
- checkSelectorList(list, "h1.fix, h2.fix, h3.fix, div#container", 4, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "h1.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h1", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(1);
- checkSelector(selector, "h2.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h2", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(2);
- checkSelector(selector, "h3.fix", 1, 101, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "h3", false, 0, 1, 0, 0);
- checkSimpleSelectorClasses(item, new String[] {"fix"});
-
- selector = list.getSelector(3);
- checkSelector(selector, "div#container", 1, 10001, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "div", false, 0, 0, 1, 0);
- checkSimpleSelectorIDs(item, new String[] {"container"});
- }
-
- private void checkSelectorList(ICSSSelectorList list, String formattedSource, int nSelectors, int nErrors) {
- assertEquals(formattedSource, list.getString());
- assertEquals(nSelectors, list.getLength());
- assertEquals(nErrors, list.getErrorCount());
- }
-
- private void checkSelector(ICSSSelector selector, String formattedSource, int items, int specificity, int nErrors) {
- assertEquals(formattedSource, selector.getString());
- assertEquals(items, selector.getLength());
- assertEquals(specificity, selector.getSpecificity());
- assertEquals(nErrors, selector.getErrorCount());
- }
-
- private void checkSimpleSelector(ICSSSelectorItem selector, String formattedSource, boolean isUniversal, int nAttributes, int nClasses, int nIds, int nPseudoNames) {
- assertTrue(selector instanceof ICSSSimpleSelector);
- assertEquals(formattedSource, ((ICSSSimpleSelector) selector).getName());
- assertEquals(isUniversal, ((ICSSSimpleSelector) selector).isUniversal());
- assertEquals(nAttributes, ((ICSSSimpleSelector) selector).getNumOfAttributes());
- assertEquals(nClasses, ((ICSSSimpleSelector) selector).getNumOfClasses());
- assertEquals(nIds, ((ICSSSimpleSelector) selector).getNumOfIDs());
- assertEquals(nPseudoNames, ((ICSSSimpleSelector) selector).getNumOfPseudoNames());
- }
-
- private void checkSimpleSelectorAttributes(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfAttributes();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getAttribute(i));
- }
- }
-
- private void checkSimpleSelectorClasses(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfClasses();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getClass(i));
- }
- }
-
- private void checkSimpleSelectorIDs(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfIDs();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getID(i));
- }
- }
-
- private void checkSimpleSelectorPseudoNames(ICSSSelectorItem selector, String[] items) {
- int nItems = ((ICSSSimpleSelector) selector).getNumOfPseudoNames();
- assertEquals(items.length, nItems);
- for (int i = 0; i < nItems; i++) {
- assertEquals(items[i], ((ICSSSimpleSelector) selector).getPseudoName(i));
- }
- }
-
- private void checkSelectorCombinator(ICSSSelectorItem combinator, String formattedSource, int combinatorType) {
- assertTrue(combinator instanceof ICSSSelectorCombinator);
- assertEquals(formattedSource, ((ICSSSelectorCombinator) combinator).getString());
- assertEquals(combinatorType, ((ICSSSelectorCombinator) combinator).getCombinatorType());
- }
-
- private ICSSSelectorList createSelectorList(String str) {
- return new CSSSelectorListImpl(str);
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
deleted file mode 100644
index 5c1e58b..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 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.css.core.tests.source;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-/**
- *
- */
-public class CSSSourceParserTest extends TestCase {
- public void testSourceOpen1() throws IOException {
- sourceParserTest("sample01.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen2() throws IOException {
- sourceParserTest("sample02.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen3() throws IOException {
- sourceParserTest("sample03.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen4() throws IOException {
- sourceParserTest("sample04.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen5() throws IOException {
- sourceParserTest("sample05.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen6() throws IOException {
- sourceParserTest("sample06.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen7() throws IOException {
- sourceParserTest("sample07.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceOpen8() throws IOException {
- sourceParserTest("sample08.css", MODE_OPEN); //$NON-NLS-1$
- }
-
- public void testSourceAppend1() throws IOException {
- sourceParserTest("sample01.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend2() throws IOException {
- sourceParserTest("sample02.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend3() throws IOException {
- sourceParserTest("sample03.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend4() throws IOException {
- sourceParserTest("sample04.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend5() throws IOException {
- sourceParserTest("sample05.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend6() throws IOException {
- sourceParserTest("sample06.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend7() throws IOException {
- sourceParserTest("sample07.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceAppend8() throws IOException {
- sourceParserTest("sample08.css", MODE_APPEND); //$NON-NLS-1$
- }
-
- public void testSourceInsert1() throws IOException {
- sourceParserTest("sample01.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert2() throws IOException {
- sourceParserTest("sample02.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert3() throws IOException {
- sourceParserTest("sample03.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert4() throws IOException {
- sourceParserTest("sample04.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert5() throws IOException {
- sourceParserTest("sample05.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert6() throws IOException {
- sourceParserTest("sample06.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert7() throws IOException {
- sourceParserTest("sample07.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- public void testSourceInsert8() throws IOException {
- sourceParserTest("sample08.css", MODE_INSERT); //$NON-NLS-1$
- }
-
- private void sourceParserTest(String filename, String mode) throws IOException {
- ICSSModel model = null;
- if (mode.equals(MODE_OPEN)) {
- model = readModelOpen(filename);
- }
- else if (mode.equals(MODE_APPEND)) {
- model = readModelAppend(filename);
- }
- else if (mode.equals(MODE_INSERT)) {
- model = readModelInsert(filename);
- }
- String result = dumpRegions(model.getStructuredDocument());
- compareResult(result, "CSSSourceParserTest-" + filename); //$NON-NLS-1$
- closeModel(model);
- }
-
- private ICSSModel readModelOpen(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.replaceText(null, 0, 0, source);
-
- return model;
- }
-
- private ICSSModel readModelAppend(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- document.replaceText(null, i, 0, source.substring(i, i + 1));
- }
-
- return model;
- }
-
- private ICSSModel readModelInsert(String filename) throws IOException {
- String source = FileUtil.createString(FILES_DIR, filename);
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- for (int i = 0; i < source.length(); i++) {
- int textIndex = source.length() - i - 1;
- document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
- }
-
- return model;
- }
-
- private void closeModel(ICSSModel model) {
- model.releaseFromEdit();
- }
-
- private String dumpRegions(IStructuredDocument document) {
- StringBuffer buf = new StringBuffer();
- buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
- return buf.toString();
- }
-
- private String dumpRegions(IStructuredDocumentRegion region) {
- StringBuffer buf = new StringBuffer();
- do {
- buf.append(dumpOneRegion(region));
- region = region.getNext();
- }
- while (region != null);
-
- buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
- StringBuffer buf = new StringBuffer();
- buf.append(documentRegion.toString());
- buf.append(FileUtil.commonEOL + " "); //$NON-NLS-1$
-
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- buf.append(textRegion.toString());
- buf.append(", "); //$NON-NLS-1$
- }
- buf.append(FileUtil.commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private boolean fDump = false;
-
- private void compareResult(String actual, String filename) throws IOException {
- if (fDump) {
- FileUtil.dumpString(actual, RESULTS_DIR, filename);
- }
- else {
- String result = FileUtil.createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
- }
-
- private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results"; //$NON-NLS-1$
- private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
- private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
- private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
deleted file mode 100644
index 019546f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 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.css.core.tests.source;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-
-
-public class CSSTextParserTest extends TestCase {
- public void testText1() throws IOException {
- textParserTest("sample01.css"); //$NON-NLS-1$
- }
-
- public void testText2() throws IOException {
- textParserTest("sample02.css"); //$NON-NLS-1$
- }
-
- public void testText3() throws IOException {
- textParserTest("sample03.css"); //$NON-NLS-1$
- }
-
- public void testText4() throws IOException {
- textParserTest("sample04.css"); //$NON-NLS-1$
- }
-
- public void testText5() throws IOException {
- textParserTest("sample05.css"); //$NON-NLS-1$
- }
-
- public void testText6() throws IOException {
- textParserTest("sample06.css"); //$NON-NLS-1$
- }
-
- public void testText7() throws IOException {
- textParserTest("sample07.css"); //$NON-NLS-1$
- }
-
- public void testText8() throws IOException {
- textParserTest("sample08.css"); //$NON-NLS-1$
- }
-
- private void textParserTest(String filename) throws IOException {
- String source = createString(filename); //$NON-NLS-1$
- CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, source);
- String result = dumpRegions(parser.getTokenList());
- compareResult(result, "CSSTextParserTest-" + filename); //$NON-NLS-1$
- }
-
- private String createString(String filename) throws FileNotFoundException, IOException {
- return FileUtil.createString(FILES_DIR, filename);
- }
-
- private String dumpRegions(List tokens) {
- StringBuffer buf = new StringBuffer();
- Iterator i = tokens.iterator();
- while (i.hasNext()) {
- buf.append(dumpOneRegion((CSSTextToken) i.next()));
- }
-
- buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
- return buf.toString();
- }
-
- private String dumpOneRegion(CSSTextToken token) {
- StringBuffer buf = new StringBuffer();
-
- buf.append("["); //$NON-NLS-1$
- buf.append(token.image);
- buf.append("] "); //$NON-NLS-1$
- buf.append(token.kind);
- buf.append(" - "); //$NON-NLS-1$
- buf.append(token.start);
- buf.append(", "); //$NON-NLS-1$
- buf.append(token.length);
-
- buf.append(FileUtil.commonEOL); //$NON-NLS-1$
- return buf.toString();
- }
-
- private boolean fDump = false;
-
- private void compareResult(String actual, String filename) throws IOException {
- if (fDump) {
- FileUtil.dumpString(actual, RESULTS_DIR, filename);
- }
- else {
- String result = FileUtil.createString(RESULTS_DIR, filename);
- assertEquals(result, actual);
- }
- }
-
- private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
- private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results";
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
deleted file mode 100644
index 0e28259..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.source;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-public class CSSUrlTest extends TestCase {
-
- /**
- * Declaration: without quotes
- */
- public void testDeclaration1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(white space.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: without quotes, with surrounded space
- */
- public void testDeclaration2() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url( white space.gif );"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: with single quote
- */
- public void testDeclaration3() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(\'white space.gif\');"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: with double quote
- */
- public void testDeclaration4() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(\"white space.gif\");"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: two urls
- */
- public void testDeclaration5() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- document.set("background-image: url(white space.gif); list-style-image: url(style image.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Style rule: two urls
- */
- public void testStyleRule1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.set("LI { background-image: url(white space.gif);\r\nlist-style-image: url(style image.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule and style rule: without quotes
- */
- public void testSomeRules1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- document.set("@import url(white space.css);LI { background-image: url(white space.gif);list-style-image: url(style image.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
-
- assertEquals(3, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[2].getType());
- assertEquals("style image.gif", urls[2].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Declaration: Two urls but parenthesis are missed, so concatenated url
- * is identified. By adding parenthesis, urls are corrected.
- */
- public void testFixError1() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- ((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
- // ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
- document.set("background-image: url(white space.gif; list-style-image: urlstyle image.gif);"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif; list-style-image: urlstyle image.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct first url
- document.replaceText(null, 37, 0, ")"); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct second url
- document.replaceText(null, 61, 0, "("); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
- assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule and style rule: Two urls but parenthesis are missed, so
- * concatenated url is identified. By adding parenthesis, urls are
- * corrected.
- */
- public void testFixError2() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- // ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
- document.set("@import url(white space.css;LI { background-image: urlwhite space.gif); }"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css;LI { background-image: urlwhite space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct first url
- document.replaceText(null, 27, 0, ")"); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-
- // correct second url
- document.replaceText(null, 55, 0, "("); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(2, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
- assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
- }
-
- /**
- * Import rule: Url has only one quote, so it is not identified as url. By
- * removing quote, url is corrected.
- */
- public void testFixError3() {
- ICSSModel model = FileUtil.createModel();
- IStructuredDocument document = model.getStructuredDocument();
- // ____________0123456789012345678901234567890
- document.set("@import url(white space.css\");"); //$NON-NLS-1$
- UrlInfo[] urls = pickupUrl(document);
- assertEquals(0, urls.length);
-
- // correct url
- document.replaceText(null, 27, 1, ""); //$NON-NLS-1$
- urls = pickupUrl(document);
- assertEquals(1, urls.length);
- assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
- assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
- }
-
-
- private UrlInfo[] pickupUrl(IStructuredDocument document) {
- List urls = new ArrayList();
- IStructuredDocumentRegion documentRegion = document.getFirstStructuredDocumentRegion();
- while (documentRegion != null) {
- ITextRegionList regionList = documentRegion.getRegions();
- Iterator i = regionList.iterator();
- while (i.hasNext()) {
- ITextRegion textRegion = (ITextRegion) i.next();
- String type = textRegion.getType();
- if (type.equals(CSSRegionContexts.CSS_URI) || type.equals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI)) {
- urls.add(new UrlInfo(type, documentRegion.getFullText(textRegion)));
- }
- }
- documentRegion = documentRegion.getNext();
- }
- return (UrlInfo[]) urls.toArray(new UrlInfo[urls.size()]);
- }
-
- private class UrlInfo {
- UrlInfo(String type, String url) {
- fType = type;
- fUrl = CSSUtil.extractUriContents(url);
- }
-
- String getType() {
- return fType;
- }
-
- String getUrl() {
- return fUrl;
- }
-
- private String fType;
- private String fUrl;
-
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java
deleted file mode 100644
index 70ead89..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/stylesheets/StyleSheetTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.css.core.tests.stylesheets;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.ProjectUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleRule;
-
-public class StyleSheetTest extends TestCase {
-
- public static final String PROJECT_NAME = "testImports";
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists()) {
- ProjectUtil.createSimpleProject(PROJECT_NAME, null, new String[] {});
- ProjectUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- /**
- * Tests for cycles in imports. If a cycle is encountered, we should not get stuck
- * in a loop or re-import the stylesheet.
- * @throws Exception
- */
- public void testImportCycle() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/cycle0.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 3 rules supplied stylesheet.", list.getLength() == 3);
- for (int i = 0; i < list.getLength(); i++) {
- CSSRule rule = list.item(i);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- // Check that the rules are imported, it would start with the last imported stylesheet's rules and move up
- assertEquals("Style rules are not equal.", ((CSSStyleRule) rule).getSelectorText(), "#cycle" + (2-i));
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests the simple case of a basic @import or a stylesheet
- * @throws Exception
- */
- public void testSimpleImport() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/site.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- String[] rules = new String[] {"#content", "a", "a:hover"};
- assertTrue("There should be a total of 3 rules supplied stylesheet.", list.getLength() == rules.length);
-
- for (int i = 0; i < list.getLength(); i++) {
- CSSRule rule = list.item(i);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- CSSStyleRule style = (CSSStyleRule)rule;
- assertEquals("Selector text did not match.", rules[i], style.getSelectorText().trim());
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests for the import of a non-existent stylesheet
- * @throws Exception
- */
- public void testNonExistentImport() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/importDNE.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 1 rule.", list.getLength() == 1);
- CSSRule rule = list.item(0);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.IMPORTRULE_NODE);
- assertEquals("Stylesheet reference is different than expected.", ((CSSImportRule) rule).getHref(), "thisfiledoesntexist.css");
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests that imports can be resolved using the various syntaxes for import.
- * <ul>
- * <li>@import url("example.css");</li>
- * <li>@import url(example.css);</li>
- * <li>@import "example.css";</li>
- * </ul>
- * @throws Exception
- */
- public void testImportMethods() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/importMethods.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 3 rules.", list.getLength() == 3);
- for (int i = 0; i < list.getLength(); i++) {
- CSSRule rule = list.item(i);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- CSSStyleRule style = (CSSStyleRule)rule;
- assertEquals("Selector text did not match.", "#content", style.getSelectorText().trim());
- }
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Tests for the import of a stylesheet in a parent directory
- * @throws Exception
- */
- public void testImportFromParentDirectory() throws Exception {
- String filePath = "/" + PROJECT_NAME + "/WebContent/style/sub.css";
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
- assertTrue("File doesn't exist: " + filePath, file.exists());
-
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForRead(file);
- if (model instanceof ICSSModel) {
- ICSSDocument document = ((ICSSModel) model).getDocument();
- if (document instanceof ICSSStyleSheet) {
- CSSRuleList list = ((ICSSStyleSheet) document).getCssRules(true);
- assertTrue("There should be a total of 1 rule.", list.getLength() == 1);
- CSSRule rule = list.item(0);
- assertTrue("Rule should be a style rule. rule.getType() == " + rule.getType(), rule.getType() == ICSSNode.STYLERULE_NODE);
- assertEquals("Stylesheet reference is different than expected.", ((CSSStyleRule) rule).getSelectorText(), "#content");
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
deleted file mode 100644
index 09bd076..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@font-face {
- font-family: "Swiss 721";
- src: url("swiss721blk.pfr"); /* Swiss 721 black */
- font-style: normal, italic;
- font-weight: 800,900; /* note the interesting problem that
- the 900 weight italic doesnft exist */
-}
-
-@font-face {
- src: local("Palatino"),
- local("Times New Roman"),
- local("New York"),
- local("Utopia"),
- url("http://somewhere/free/font");
- font-family: serif;
- font-weight: 100, 200, 300, 400, 500;
- font-style: normal;
- font-variant: normal;
- font-size: all
-}
-
-@font-face {
- src: local("Alabama Italic"),
- url(http://www.fonts.org/A/alabama-italic) format("truetype");
- panose-1: 2 4 5 2 5 4 5 9 3 3;
- font-family: Alabama, serif;
- font-weight: 300, 400, 500;
- font-style: italic, oblique;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css
deleted file mode 100644
index f6c785f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFamilyTest.css
+++ /dev/null
@@ -1,15 +0,0 @@
-a.c {
- font-family: Courier;
-}
-
-a.cn {
- font-family: Courier New;
-}
-
-a.qcn {
- font-family: "Courier New";
-}
-
-a.cs {
- font-family: Comic Sans ;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java
deleted file mode 100644
index 24d3006..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSModelLoadTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.css.core.tests.testfiles;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public class CSSModelLoadTest extends TestCase {
- private static final String HTML4_CSS = "html4.css";
-
- public CSSModelLoadTest() {
- super("CSS Model Loading Suite");
- }
-
- public void testLoadCSSfromStream() throws UnsupportedEncodingException, IOException {
- InputStream input = null;
-
- input = CSSModelLoadTest.class.getResourceAsStream(HTML4_CSS);
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(HTML4_CSS, input, null);
- assertNotNull(model);
- assertTrue("IStructuredModel was not a ICSSModel", model instanceof ICSSModel);
- assertTrue("contents are incomplete", model.getStructuredDocument().get().indexOf("Basic HTML style information") > 4);
- model.releaseFromEdit();
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
deleted file mode 100644
index b977f2c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@page {size: 8.5in 11in;margin: 2cm}
-
-@page {
- size: auto; /* auto is the initial value */
- margin: 10%;
-}
-
-@page :left {
- margin-left: 4cm;
- margin-right: 3cm;
-}
-@page :right {
- margin-left: 3cm;
- margin-right: 4cm;
-}
-
-@page narrow {size: 9cm 18cm}@page rotated {size: landscape}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
deleted file mode 100644
index 0d205a2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* primitive values */
-NUMBERS {
- NUMBER: 123.456;
- PERCENTAGE: 123.456%;
- EMS: 123.456em;
- EXS: 123.456ex;
- PX: 123.456px;
- PX2: -123px;
- CM: 123.456cm;
- MM: 123.456mm;
- IN: 123.456in;
- PT: 123.456pt;
- PC: 123.456pc;
- DEG: -123.456deg;
- RAD: 123.456rad;
- GRAD: 123.456grad;
- MS: 123.456ms;
- S: 123.456s;
- HZ: 123.456Hz;
- KHZ: 123.456kHz;
- DIMENSION: -123.456zzz;
- INTEGER: 123;
-}
-
-STRINGS {
- STRING: "string";
- URI: URL("http://www.ibm.com/");
- IDENT: left;
- HASH: #abcdef;
- URANGE: U+20A7;
- SLASH: /;
- COMMA: ,;
- INHERIT_PRIMITIVE: inherit;
- ATTR: attr(KEY);
- FORMAT: format("truedoc");
- LOCAL: local("Excelsior Roman");
-}
-
-FUNCTIONS {
- COUNTER: counter(par-num, upper-roman);
- RECT: rect(12, 34, 56, 78);
- RGBCOLOR: rgb(255, 128, 0);
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css
deleted file mode 100644
index c84d84f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/html4.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Basic HTML style information.
- */
-html,
-address,
-blockquote,listing,
-body, dd, div,
-dl, dt, fieldset, legend,form,
-frame, frameset,
-h1, h2, h3, h4,
-h5, h6, noframes,noscript,
-ol, p, ul, center,
-dir, hr, menu, pre, plaintext, xmp { display: block }
-
-ol {counter-reset: _anonymous; list-style-type: decimal}
-ul,dir,menu {counter-reset: _anonymous; list-style-type: disc}
-li {display: list-item}
-li {counter-increment: _anonymous}
-
-head { display: none }
-table { display: table }
-tr { display: table-row }
-thead { display: table-header-group }
-tbody { display: table-row-group }
-tfoot { display: table-footer-group }
-col { display: table-column }
-colgroup { display: table-column-group }
-td, th { display: table-cell; }
-caption { display: table-caption }
-th { font-weight: bolder;}
-caption { text-align: center;horizontal-align:top }
-button, textarea,
-input, object,
-select, img { display:inline-block; }
-pre,plaintext, xmp { white-space: pre }
-h1, h2, h3, h4,
-h5, h6, b,
-strong { font-weight: bold }
-i, cite, em,dfn,
-var, address { font-style: italic }
-pre, tt, code,plaintext, xmp,
-kbd, samp { font-family: monospace }
-ol { list-style-type: decimal }
-br:before { content: "\A" }
-center { text-align: center }
-sub { vertical-align: sub }
-sup { vertical-align: super }
-u, ins { text-decoration: underline }
-input { text-decoration: none }
-button { white-space: nowrap }
-a[href] { text-decoration: underline }
-
-/*
- * styles that may be different for different user agent.
- * This part may need to move out and put into different css files.
- */
-body { line-height: 1.12em }
-h1 { font-size: 2em; margin: .67em 0 }
-h2 { font-size: 1.5em; margin: .75em 0 }
-h3 { font-size: 1.17em; margin: .83em 0 }
-h4, p,ul,
-fieldset, form,
-ol, dl, dir,
-menu { margin: 1.12em 0 }
-blockquote { margin: 1em 40px }
-h5 { font-size: .83em; margin: 1.5em 0 }
-h6 { font-size: .75em; margin: 1.67em 0 }
-blockquote { margin-left: 40px; margin-right: 40px }
-big { font-size: larger }
-small, sub, sup { font-size: smaller }
-s, strike, del { text-decoration: line-through }
-hr { border: 1px inset }
-ol, ul, dir,
-menu, dd { margin-left: 40px;border:0px }
-ol ul, ul ol,
-ul ul, ol ol { margin-top: 0; margin-bottom: 0 }
-abbr, acronym { font-variant: small-caps; letter-spacing: 0.1em }
-a[href] { color:blue;}
-select {background-color: window;font-family:sans-serif;font-size:13px;font-weight: normal;}
-textarea {border: 2px inset;font-size:13px;font-family:monospace}
-textarea,
-input {background-color: window}
-input,
-input[type=text],
-input[type=password] {border: 2px inset;font-size:13px;font-family:sans-serif;font-weight: normal;}
-/* following upcased TYPE is for workaround the WTP M2 bug of not setting default content type */
-input[TYPE=submit],input[TYPE=reset],input[TYPE=button],input[TYPE=cancel],
-button,
-input[type=button],
-input[type=reset],
-input[type=cancel],
-input[type=submit] {background-color: ButtonFace; border: 2px outset; font-size:13px;
- font-family:sans-serif;text-align: center;font-weight: normal;}
-input[type=image],
-input[type=checkbox],
-input[type=radio] {border: none }
-input[type=hidden] {border: none }
-img {border: 0px none}
-listing {font-family:monospace;font-size: medium;white-space: pre; margin: 1em 0;}
-tbody,thead,tfoot {vertical-align: middle;}
-blink {text-decoration: blink;}
-
-hr {margin: 0.5em auto 0.5em auto;}
-caption {border: 0px none;margin: 0px; padding:0px 0px 4px 0px;}
-td, th,
-table {border: 4px none;}
-button {padding: 3px 5px;text-align: center;vertical-align: middle;}
-button,textarea,input {vertical-align: text-bottom;color:black;font-style:none;}
-select {vertical-align: text-bottom;}
-input[type=image] {vertical-align: baseline;}
-li {min-height:1.2em}
-button {min-height:1.8em}
-div,tr,form {min-height:1.2em}
-table,td {min-width:1.2em;min-height:1.2em}
-
-/* nested lists have no top/bottom margins */
-ul ul, ul ol, ul dir, ul menu, ul dl,
-ol ul, ol ol, ol dir, ol menu, ol dl,
-dir ul, dir ol, dir dir, dir menu, dir dl,
-menu ul, menu ol, menu dir, menu menu, menu dl,
-dl ul, dl ol, dl dir, dl menu, dl dl {margin-top: 0; margin-bottom: 0;}
-
-/* 2 deep unordered lists use a circle */
-ol ul, ul ul, menu ul, dir ul,
-ol menu, ul menu, menu menu, dir menu,
-ol dir, ul dir, menu dir, dir dir {list-style-type: circle;}
-
-/* 3 deep (or more) unordered lists use a square */
-ol ol ul, ol ul ul, ol menu ul, ol dir ul,
-ol ol menu, ol ul menu, ol menu menu, ol dir menu,
-ol ol dir, ol ul dir, ol menu dir, ol dir dir,
-ul ol ul, ul ul ul, ul menu ul, ul dir ul,
-ul ol menu, ul ul menu, ul menu menu, ul dir menu,
-ul ol dir, ul ul dir, ul menu dir, ul dir dir,
-menu ol ul, menu ul ul, menu menu ul, menu dir ul,
-menu ol menu, menu ul menu, menu menu menu, menu dir menu,
-menu ol dir, menu ul dir, menu menu dir, menu dir dir,
-dir ol ul, dir ul ul, dir menu ul, dir dir ul,
-dir ol menu, dir ul menu, dir menu menu, dir dir menu,
-dir ol dir, dir ul dir, dir menu dir, dir dir dir { list-style-type: square;}
-
-/**
- * We do not write codes to support some elements. This part defines properties for them
- * to improve the look of these elements.
- */
-applet {border: 1px solid;}
-fieldset {border: 2px groove;}
-applet,iframe {display:inline-block; border:3px inset; }
-object {display:inline-block;border:0px none;}
-
-
-/*
- * Sets right margin to have gap between widgets.
- */
-input,textarea,button { margin-right: 2px;}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
deleted file mode 100644
index e1ac2f7..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 3] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[3, 9] ({
-
- )
- ContextRegion--> LBRACE: 0-1/6,
-[9, 21] (color: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[21, 24] (
- )
- ContextRegion--> S: 0-3,
-[24, 25] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[25, 30] (
-
- )
- ContextRegion--> S: 0-5,
-[30, 54] (background-color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-24,
-[54, 59] (
-
-)
- ContextRegion--> S: 0-5,
-[59, 60] (})
- ContextRegion--> RBRACE: 0-1,
-[60, 62] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
deleted file mode 100644
index f515539..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
+++ /dev/null
@@ -1,41 +0,0 @@
-[0, 23] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[23, 24] (;)
- ContextRegion--> DELIMITER: 0-1,
-[24, 26] (
-)
- ContextRegion--> S: 0-2,
-[26, 61] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21, ContextRegion--> S: 21-22, ContextRegion--> URI: 22-35,
-[61, 62] (;)
- ContextRegion--> DELIMITER: 0-1,
-[62, 64] (
-)
- ContextRegion--> S: 0-2,
-[64, 96] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[96, 97] (;)
- ContextRegion--> DELIMITER: 0-1,
-[97, 99] (
-)
- ContextRegion--> S: 0-2,
-[99, 155] (@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 )
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> UNKNOWN: 19-20, ContextRegion--> MEDIUM: 20-26, ContextRegion--> MEDIA_SEPARATOR: 26-27, ContextRegion--> MEDIUM: 27-33, ContextRegion--> MEDIA_SEPARATOR: 33-34, ContextRegion--> UNKNOWN: 34-35, ContextRegion--> MEDIUM: 35-41/42, ContextRegion--> UNKNOWN: 42-48, ContextRegion--> MEDIA_SEPARATOR: 48-49, ContextRegion--> MEDIUM: 49-55/56,
-[155, 169] (@import media6)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> UNKNOWN: 8-14,
-[169, 170] (;)
- ContextRegion--> DELIMITER: 0-1,
-[170, 221] (
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-)
- ContextRegion--> S: 0-4, ContextRegion--> CDO: 4-8/9, ContextRegion--> COMMENT: 9-23, ContextRegion--> S: 23-27, ContextRegion--> CDC: 27-30/34, ContextRegion--> COMMENT: 34-49, ContextRegion--> S: 49-51,
-[221, 227] (kuso
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/6,
-
--------
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
deleted file mode 100644
index 2a1dad1..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
+++ /dev/null
@@ -1,102 +0,0 @@
-[0, 29] (@import url("../sample2.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29,
-[29, 30] (;)
- ContextRegion--> DELIMITER: 0-1,
-[30, 57] (
-
-/* Sample Styles */
-
-)
- ContextRegion--> S: 0-4, ContextRegion--> COMMENT: 4-23, ContextRegion--> S: 23-27,
-[57, 62] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[62, 66] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[66, 79] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[79, 80] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[80, 83] (
- )
- ContextRegion--> S: 0-3,
-[83, 120] (background-color : rgb(181, 253, 211))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23, ContextRegion--> DECLARATION_VALUE_NUMBER: 23-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_NUMBER: 28-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_NUMBER: 33-36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[120, 121] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[121, 124] (
- )
- ContextRegion--> S: 0-3,
-[124, 143] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[143, 144] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[144, 147] (
- )
- ContextRegion--> S: 0-3,
-[147, 186] (font-family : "Heisei Mincho W3", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-39,
-[186, 188] (
-)
- ContextRegion--> S: 0-2,
-[188, 189] (})
- ContextRegion--> RBRACE: 0-1,
-[189, 193] (
-
-)
- ContextRegion--> S: 0-4,
-[193, 205] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[205, 207] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[207, 224] (margin-left : 4cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[224, 225] ( )
- ContextRegion--> S: 0-1,
-[225, 226] (})
- ContextRegion--> RBRACE: 0-1,
-[226, 230] (
-
-)
- ContextRegion--> S: 0-4,
-[230, 243] (@media aural )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[243, 247] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[247, 255] (P.heidi )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[255, 260] ({
- )
- ContextRegion--> LBRACE: 0-1/5,
-[260, 281] (azimuth : center-left)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[281, 282] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[282, 286] (
- )
- ContextRegion--> S: 0-4,
-[286, 305] (elevation : 12.3deg)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[305, 306] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[306, 310] (
- )
- ContextRegion--> S: 0-4,
-[310, 327] (pause : 30ms 1.6s)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[327, 330] (
- )
- ContextRegion--> S: 0-3,
-[330, 331] (})
- ContextRegion--> RBRACE: 0-1,
-[331, 333] (
-)
- ContextRegion--> S: 0-2,
-[333, 334] (})
- ContextRegion--> RBRACE: 0-1,
-[334, 336] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
deleted file mode 100644
index 05d911f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[49, 50] (;)
- ContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- ContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21, ContextRegion--> S: 21-22, ContextRegion--> URI: 22-35,
-[87, 88] (;)
- ContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- ContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- ContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- ContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- ContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- ContextRegion--> S: 0-4,
-[171, 184] (@media print )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- ContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- ContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- ContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- ContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- ContextRegion--> S: 0-2,
-[255, 256] (})
- ContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- ContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- ContextRegion--> S: 0-2,
-[280, 281] (})
- ContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- ContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- ContextRegion--> S: 0-2,
-[313, 314] (})
- ContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- ContextRegion--> S: 0-2,
-[316, 325] (body > P )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- ContextRegion--> S: 0-2,
-[346, 347] (})
- ContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- ContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- ContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- ContextRegion--> S: 0-2,
-[366, 375] (math + p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- ContextRegion--> S: 0-2,
-[394, 395] (})
- ContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- ContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16,
-[431, 433] ( )
- ContextRegion--> S: 0-2,
-[433, 434] (})
- ContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- ContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- ContextRegion--> S: 0-2,
-[463, 464] (})
- ContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- ContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- ContextRegion--> S: 0-2,
-[503, 504] (})
- ContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- ContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- ContextRegion--> S: 0-2,
-[567, 568] (})
- ContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- ContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- ContextRegion--> S: 0-2,
-[606, 607] (})
- ContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- ContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- ContextRegion--> S: 0-2,
-[654, 655] (})
- ContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- ContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- ContextRegion--> S: 0-2,
-[687, 688] (})
- ContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- ContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- ContextRegion--> S: 0-2,
-[720, 721] (})
- ContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- ContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- ContextRegion--> S: 0-2,
-[802, 803] (})
- ContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- ContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- ContextRegion--> S: 0-2,
-[888, 889] (})
- ContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- ContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- ContextRegion--> S: 0-2,
-[919, 920] (})
- ContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- ContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- ContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- ContextRegion--> S: 0-2,
-[949, 950] (})
- ContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- ContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- ContextRegion--> S: 0-2,
-[981, 982] (})
- ContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- ContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- ContextRegion--> S: 0-2,
-[1019, 1020] (})
- ContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- ContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- ContextRegion--> S: 0-2,
-[1057, 1058] (})
- ContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- ContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- ContextRegion--> S: 0-2,
-[1099, 1100] (})
- ContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- ContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- ContextRegion--> S: 0-2,
-[1142, 1143] (})
- ContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- ContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- ContextRegion--> S: 0-2,
-[1186, 1187] (})
- ContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- ContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- ContextRegion--> S: 0-2,
-[1226, 1227] (})
- ContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- ContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- ContextRegion--> S: 0-2,
-[1264, 1265] (})
- ContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- ContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- ContextRegion--> S: 0-2,
-[1303, 1304] (})
- ContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- ContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- ContextRegion--> S: 0-2,
-[1342, 1343] (})
- ContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- ContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- ContextRegion--> S: 0-2,
-[1397, 1398] (})
- ContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- ContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- ContextRegion--> S: 0-2,
-[1436, 1437] (})
- ContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- ContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- ContextRegion--> S: 0-2,
-[1491, 1492] (})
- ContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- ContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- ContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- ContextRegion--> S: 0-2,
-[1549, 1550] (})
- ContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- ContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- ContextRegion--> S: 0-1,
-[1592, 1593] (})
- ContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- ContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- ContextRegion--> S: 0-1,
-[1635, 1636] (})
- ContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- ContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- ContextRegion--> S: 0-1,
-[1704, 1705] (})
- ContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- ContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- ContextRegion--> S: 0-1,
-[1769, 1770] (})
- ContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- ContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- ContextRegion--> S: 0-1,
-[1827, 1828] (})
- ContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
deleted file mode 100644
index 05d911f..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23,
-[49, 50] (;)
- ContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- ContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21, ContextRegion--> S: 21-22, ContextRegion--> URI: 22-35,
-[87, 88] (;)
- ContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- ContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- ContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- ContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- ContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- ContextRegion--> S: 0-4,
-[171, 184] (@media print )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- ContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- ContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- ContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- ContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- ContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- ContextRegion--> S: 0-2,
-[255, 256] (})
- ContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- ContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- ContextRegion--> S: 0-2,
-[280, 281] (})
- ContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- ContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- ContextRegion--> S: 0-2,
-[313, 314] (})
- ContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- ContextRegion--> S: 0-2,
-[316, 325] (body > P )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- ContextRegion--> S: 0-2,
-[346, 347] (})
- ContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- ContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- ContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- ContextRegion--> S: 0-2,
-[366, 375] (math + p )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- ContextRegion--> S: 0-2,
-[394, 395] (})
- ContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- ContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16,
-[431, 433] ( )
- ContextRegion--> S: 0-2,
-[433, 434] (})
- ContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- ContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- ContextRegion--> S: 0-2,
-[463, 464] (})
- ContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- ContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- ContextRegion--> S: 0-2,
-[503, 504] (})
- ContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- ContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- ContextRegion--> S: 0-2,
-[567, 568] (})
- ContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- ContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- ContextRegion--> S: 0-2,
-[606, 607] (})
- ContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- ContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- ContextRegion--> S: 0-2,
-[654, 655] (})
- ContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- ContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- ContextRegion--> S: 0-2,
-[687, 688] (})
- ContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- ContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- ContextRegion--> S: 0-2,
-[720, 721] (})
- ContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- ContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- ContextRegion--> S: 0-2,
-[802, 803] (})
- ContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- ContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- ContextRegion--> S: 0-2,
-[888, 889] (})
- ContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- ContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- ContextRegion--> S: 0-2,
-[919, 920] (})
- ContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- ContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- ContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- ContextRegion--> S: 0-2,
-[949, 950] (})
- ContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- ContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- ContextRegion--> S: 0-2,
-[981, 982] (})
- ContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- ContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- ContextRegion--> S: 0-2,
-[1019, 1020] (})
- ContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- ContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- ContextRegion--> S: 0-2,
-[1057, 1058] (})
- ContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- ContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- ContextRegion--> S: 0-2,
-[1099, 1100] (})
- ContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- ContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- ContextRegion--> S: 0-2,
-[1142, 1143] (})
- ContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- ContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- ContextRegion--> S: 0-2,
-[1186, 1187] (})
- ContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- ContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- ContextRegion--> S: 0-2,
-[1226, 1227] (})
- ContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- ContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- ContextRegion--> S: 0-2,
-[1264, 1265] (})
- ContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- ContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- ContextRegion--> S: 0-2,
-[1303, 1304] (})
- ContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- ContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- ContextRegion--> S: 0-2,
-[1342, 1343] (})
- ContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- ContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- ContextRegion--> S: 0-2,
-[1397, 1398] (})
- ContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- ContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- ContextRegion--> S: 0-2,
-[1436, 1437] (})
- ContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- ContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- ContextRegion--> S: 0-2,
-[1491, 1492] (})
- ContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- ContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- ContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- ContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- ContextRegion--> S: 0-2,
-[1549, 1550] (})
- ContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- ContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- ContextRegion--> S: 0-1,
-[1592, 1593] (})
- ContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- ContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- ContextRegion--> S: 0-1,
-[1635, 1636] (})
- ContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- ContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- ContextRegion--> S: 0-1,
-[1704, 1705] (})
- ContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- ContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- ContextRegion--> S: 0-1,
-[1769, 1770] (})
- ContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- ContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- ContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- ContextRegion--> S: 0-1,
-[1827, 1828] (})
- ContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
deleted file mode 100644
index 6477cb0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
+++ /dev/null
@@ -1,68 +0,0 @@
-[0, 12] (declaration )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-11/12,
-[12, 16] ({
- )
- ContextRegion--> LBRACE: 0-1/4,
-[16, 33] (dimension : 100ex)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-17,
-[33, 34] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[34, 37] (
- )
- ContextRegion--> S: 0-3,
-[37, 133] (function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright"))
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_FUNCTION: 11-16, ContextRegion--> DECLARATION_VALUE_NUMBER: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_NUMBER: 21-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_NUMBER: 26-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_NUMBER: 31-34, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 34-35, ContextRegion--> DECLARATION_VALUE_OPERATOR: 35-36/37, ContextRegion--> DECLARATION_VALUE_FUNCTION: 37-44, ContextRegion--> DECLARATION_VALUE_STRING: 44-57, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 57-58, ContextRegion--> DECLARATION_VALUE_OPERATOR: 58-59/60, ContextRegion--> DECLARATION_VALUE_FUNCTION: 60-66, ContextRegion--> DECLARATION_VALUE_STRING: 66-95, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 95-96,
-[133, 134] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[134, 137] (
- )
- ContextRegion--> S: 0-3,
-[137, 151] (hash : #aabbcc)
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[151, 152] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[152, 155] (
- )
- ContextRegion--> S: 0-3,
-[155, 166] (ident : any)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[166, 167] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[167, 170] (
- )
- ContextRegion--> S: 0-3,
-[170, 184] (number : 99999)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-14,
-[184, 185] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[185, 188] (
- )
- ContextRegion--> S: 0-3,
-[188, 205] (percentage : 100%)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 13-17,
-[205, 206] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[206, 209] (
- )
- ContextRegion--> S: 0-3,
-[209, 226] (string : "string")
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-17,
-[226, 227] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[227, 230] (
- )
- ContextRegion--> S: 0-3,
-[230, 268] (unicode-range : U+??, U+100-220, U+4??)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[268, 269] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[269, 271] (
-)
- ContextRegion--> S: 0-2,
-[271, 272] (})
- ContextRegion--> RBRACE: 0-1,
-[272, 274] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
deleted file mode 100644
index a4879a8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
+++ /dev/null
@@ -1,454 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
- ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21,
-[21, 22] (;)
- ContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- ContextRegion--> S: 0-4,
-[26, 70] (@import url("../sample2.css") projection, tv)
- ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29/30, ContextRegion--> MEDIUM: 30-40, ContextRegion--> MEDIA_SEPARATOR: 40-41/42, ContextRegion--> MEDIUM: 42-44,
-[70, 71] (;)
- ContextRegion--> DELIMITER: 0-1,
-[71, 75] (
-
-)
- ContextRegion--> S: 0-4,
-[75, 80] (BODY )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[80, 87] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[87, 100] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[100, 101] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[101, 107] (
- )
- ContextRegion--> S: 0-6,
-[107, 126] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[126, 127] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 133] (
- )
- ContextRegion--> S: 0-6,
-[133, 172] (background-color : rgb( 181, 253, 211 ))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39,
-[172, 174] (
-)
- ContextRegion--> S: 0-2,
-[174, 175] (})
- ContextRegion--> RBRACE: 0-1,
-[175, 179] (
-
-)
- ContextRegion--> S: 0-4,
-[179, 182] (UL )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[182, 189] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[189, 202] (color : black)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[202, 203] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[203, 209] (
- )
- ContextRegion--> S: 0-6,
-[209, 251] (list-style-image : url("images/l_a01.gif"))
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_URI: 19-42,
-[251, 252] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[252, 258] (
- )
- ContextRegion--> S: 0-6,
-[258, 287] (list-style-position : outside)
- ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_IDENT: 22-29,
-[287, 289] (
-)
- ContextRegion--> S: 0-2,
-[289, 290] (})
- ContextRegion--> RBRACE: 0-1,
-[290, 294] (
-
-)
- ContextRegion--> S: 0-4,
-[294, 297] (H1 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[297, 304] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[304, 317] (color : white)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[317, 318] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[318, 324] (
- )
- ContextRegion--> S: 0-6,
-[324, 343] (text-align : center)
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[343, 344] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[344, 350] (
- )
- ContextRegion--> S: 0-6,
-[350, 377] (border-left-color : #996666)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_HASH: 20-27,
-[377, 378] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[378, 384] (
- )
- ContextRegion--> S: 0-6,
-[384, 401] (padding-top : 0px)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[401, 402] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[402, 408] (
- )
- ContextRegion--> S: 0-6,
-[408, 427] (padding-right : 1cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19,
-[427, 428] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[428, 434] (
- )
- ContextRegion--> S: 0-6,
-[434, 452] (padding-bottom : 2)
- ContextRegion--> DECLARATION_PROPERTY: 0-14/15, ContextRegion--> DECLARATION_SEPARATOR: 15-16/17, ContextRegion--> DECLARATION_VALUE_NUMBER: 17-18,
-[452, 453] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[453, 459] (
- )
- ContextRegion--> S: 0-6,
-[459, 477] (padding-left : 3em)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-18,
-[477, 478] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[478, 484] (
- )
- ContextRegion--> S: 0-6,
-[484, 504] (border-style : solid)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-20,
-[504, 505] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[505, 511] (
- )
- ContextRegion--> S: 0-6,
-[511, 535] (border-top-width : 4.5ex)
- ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-24,
-[535, 536] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[536, 542] (
- )
- ContextRegion--> S: 0-6,
-[542, 566] (border-right-width : 5in)
- ContextRegion--> DECLARATION_PROPERTY: 0-18/19, ContextRegion--> DECLARATION_SEPARATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_DIMENSION: 21-24,
-[566, 567] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[567, 573] (
- )
- ContextRegion--> S: 0-6,
-[573, 601] (border-bottom-width : 6.02mm)
- ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_DIMENSION: 22-28,
-[601, 602] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[602, 608] (
- )
- ContextRegion--> S: 0-6,
-[608, 629] (border-left-width : 7)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_NUMBER: 20-21,
-[629, 631] (
-)
- ContextRegion--> S: 0-2,
-[631, 632] (})
- ContextRegion--> RBRACE: 0-1,
-[632, 636] (
-
-)
- ContextRegion--> S: 0-4,
-[636, 646] (H1:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_PSEUDO: 2-9/10,
-[646, 653] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[653, 697] (content : "Chapter " counter( chapter ) ". ")
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_STRING: 10-20/21, ContextRegion--> DECLARATION_VALUE_FUNCTION: 21-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39/40, ContextRegion--> DECLARATION_VALUE_STRING: 40-44,
-[697, 698] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[698, 704] (
- )
- ContextRegion--> S: 0-6,
-[704, 731] (counter-increment : chapter)
- ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_IDENT: 20-27,
-[731, 732] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[732, 738] (
- )
- ContextRegion--> S: 0-6,
-[738, 761] (counter-reset : section)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_IDENT: 16-23,
-[761, 763] (
-)
- ContextRegion--> S: 0-2,
-[763, 764] (})
- ContextRegion--> RBRACE: 0-1,
-[764, 768] (
-
-)
- ContextRegion--> S: 0-4,
-[768, 779] (IMG:before )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_PSEUDO: 3-10/11,
-[779, 780] ({)
- ContextRegion--> LBRACE: 0-1,
-[780, 799] (content : attr(alt))
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_FUNCTION: 10-15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 18-19,
-[799, 800] (})
- ContextRegion--> RBRACE: 0-1,
-[800, 804] (
-
-)
- ContextRegion--> S: 0-4,
-[804, 815] (DIV.sample )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_CLASS: 3-10/11,
-[815, 822] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[822, 863] (font-family : "Robson Celtic", sans-serif)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_IDENT: 31-41,
-[863, 864] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[864, 870] (
- )
- ContextRegion--> S: 0-6,
-[870, 889] (position : absolute)
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_IDENT: 11-19,
-[889, 890] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[890, 896] (
- )
- ContextRegion--> S: 0-6,
-[896, 910] (left : 833.5pc)
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_DIMENSION: 7-14,
-[910, 911] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[911, 917] (
- )
- ContextRegion--> S: 0-6,
-[917, 926] (top : 90%)
- ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 6-9,
-[926, 927] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[927, 933] (
- )
- ContextRegion--> S: 0-6,
-[933, 946] (width : 100pt)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[946, 947] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[947, 953] (
- )
- ContextRegion--> S: 0-6,
-[953, 971] (height : 110.777px)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_DIMENSION: 9-18,
-[971, 972] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[972, 978] (
- )
- ContextRegion--> S: 0-6,
-[978, 1015] (clip : rect( -5px, 80px, 130px, 0px ))
- ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_FUNCTION: 7-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-23, ContextRegion--> DECLARATION_VALUE_OPERATOR: 23-24/25, ContextRegion--> DECLARATION_VALUE_DIMENSION: 25-30, ContextRegion--> DECLARATION_VALUE_OPERATOR: 30-31/32, ContextRegion--> DECLARATION_VALUE_DIMENSION: 32-35/36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[1015, 1017] (
-)
- ContextRegion--> S: 0-2,
-[1017, 1018] (})
- ContextRegion--> RBRACE: 0-1,
-[1018, 1022] (
-
-)
- ContextRegion--> S: 0-4,
-[1022, 1033] (@font-face )
- ContextRegion--> FONT_FACE: 0-10/11,
-[1033, 1040] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[1040, 1065] (font-family : "Swiss 721")
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-25,
-[1065, 1066] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1066, 1072] (
- )
- ContextRegion--> S: 0-6,
-[1072, 1158] (src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright"))
- ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_URI: 6-26/27, ContextRegion--> DECLARATION_VALUE_FUNCTION: 27-34, ContextRegion--> DECLARATION_VALUE_STRING: 34-47, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 47-48, ContextRegion--> DECLARATION_VALUE_OPERATOR: 48-49/50, ContextRegion--> DECLARATION_VALUE_FUNCTION: 50-56, ContextRegion--> DECLARATION_VALUE_STRING: 56-85, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 85-86,
-[1158, 1159] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1159, 1165] (
- )
- ContextRegion--> S: 0-6,
-[1165, 1203] (unicode-range : U+??, U+100-220, U+4??)
- ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[1203, 1204] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1204, 1210] (
- )
- ContextRegion--> S: 0-6,
-[1210, 1247] (font-weight : 100, 200, 300, 400, 500)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_NUMBER: 14-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_NUMBER: 19-22, ContextRegion--> DECLARATION_VALUE_OPERATOR: 22-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37,
-[1247, 1249] (
-)
- ContextRegion--> S: 0-2,
-[1249, 1250] (})
- ContextRegion--> RBRACE: 0-1,
-[1250, 1254] (
-
-)
- ContextRegion--> S: 0-4,
-[1254, 1266] (@page :left )
- ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[1266, 1267] ({)
- ContextRegion--> LBRACE: 0-1,
-[1267, 1284] (margin-left : 4cm)
- ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[1284, 1285] (})
- ContextRegion--> RBRACE: 0-1,
-[1285, 1289] (
-
-)
- ContextRegion--> S: 0-4,
-[1289, 1302] (@media aural )
- ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13,
-[1302, 1309] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[1309, 1332] (H1, H2, H3, H4, H5, H6 )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10, ContextRegion--> SELECTOR_SEPARATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14, ContextRegion--> SELECTOR_SEPARATOR: 14-15/16, ContextRegion--> SELECTOR_ELEMENT_NAME: 16-18, ContextRegion--> SELECTOR_SEPARATOR: 18-19/20, ContextRegion--> SELECTOR_ELEMENT_NAME: 20-22/23,
-[1332, 1343] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1343, 1369] (voice-family : paul, child)
- ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26,
-[1369, 1370] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1370, 1380] (
- )
- ContextRegion--> S: 0-10,
-[1380, 1391] (stress : 20)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-11,
-[1391, 1392] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1392, 1402] (
- )
- ContextRegion--> S: 0-10,
-[1402, 1415] (richness : 90)
- ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_NUMBER: 11-13,
-[1415, 1416] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1416, 1426] (
- )
- ContextRegion--> S: 0-10,
-[1426, 1453] (cue-before : url("ping.au"))
- ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_URI: 13-27,
-[1453, 1459] (
- )
- ContextRegion--> S: 0-6,
-[1459, 1460] (})
- ContextRegion--> RBRACE: 0-1,
-[1460, 1466] (
- )
- ContextRegion--> S: 0-6,
-[1466, 1474] (P.heidi )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1474, 1485] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1485, 1506] (azimuth : center-left)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[1506, 1507] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1507, 1517] (
- )
- ContextRegion--> S: 0-10,
-[1517, 1536] (elevation : 12.3deg)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[1536, 1537] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1537, 1547] (
- )
- ContextRegion--> S: 0-10,
-[1547, 1564] (pause : 30ms 1.6s)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[1564, 1570] (
- )
- ContextRegion--> S: 0-6,
-[1570, 1571] (})
- ContextRegion--> RBRACE: 0-1,
-[1571, 1577] (
- )
- ContextRegion--> S: 0-6,
-[1577, 1585] (P.peter )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1585, 1596] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1596, 1611] (azimuth : right)
- ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-15,
-[1611, 1612] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1612, 1622] (
- )
- ContextRegion--> S: 0-10,
-[1622, 1642] (elevation : -0.36rad)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-20,
-[1642, 1643] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1643, 1653] (
- )
- ContextRegion--> S: 0-10,
-[1653, 1666] (pitch : 210Hz)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[1666, 1672] (
- )
- ContextRegion--> S: 0-6,
-[1672, 1673] (})
- ContextRegion--> RBRACE: 0-1,
-[1673, 1679] (
- )
- ContextRegion--> S: 0-6,
-[1679, 1686] (P.goat )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-6/7,
-[1686, 1697] ({
- )
- ContextRegion--> LBRACE: 0-1/11,
-[1697, 1712] (volume : x-soft)
- ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_IDENT: 9-15,
-[1712, 1713] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1713, 1723] (
- )
- ContextRegion--> S: 0-10,
-[1723, 1741] (elevation : 66grad)
- ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-18,
-[1741, 1742] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1742, 1752] (
- )
- ContextRegion--> S: 0-10,
-[1752, 1767] (pitch : 0.17kHz)
- ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-15,
-[1767, 1773] (
- )
- ContextRegion--> S: 0-6,
-[1773, 1774] (})
- ContextRegion--> RBRACE: 0-1,
-[1774, 1776] (
-)
- ContextRegion--> S: 0-2,
-[1776, 1777] (})
- ContextRegion--> RBRACE: 0-1,
-[1777, 1781] (
-
-)
- ContextRegion--> S: 0-4,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css
deleted file mode 100644
index 99dc9af..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample08.css
+++ /dev/null
@@ -1,19 +0,0 @@
-[0, 18] (a.newWindow /* */ )
- ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-11/12, ContextRegion--> COMMENT: 12-17, ContextRegion--> S: 17-18,
-[18, 25] ({
- )
- ContextRegion--> LBRACE: 0-1/7,
-[25, 77] (background-image: url(../images/test.png) !important)
- ContextRegion--> DECLARATION_PROPERTY: 0-16, ContextRegion--> DECLARATION_SEPARATOR: 16-17/18, ContextRegion--> DECLARATION_VALUE_URI: 18-41/42, ContextRegion--> CSS_DECLARATION_VALUE_IMPORTANT: 42-52,
-[77, 78] (;)
- ContextRegion--> DECLARATION_DELIMITER: 0-1,
-[78, 80] (
-)
- ContextRegion--> S: 0-2,
-[80, 81] (})
- ContextRegion--> RBRACE: 0-1,
-[81, 83] (
-)
- ContextRegion--> S: 0-2,
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
deleted file mode 100644
index 403a435..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
+++ /dev/null
@@ -1,29 +0,0 @@
-[H1] SELECTOR_ELEMENT_NAME - 0, 2
-[ ] S - 2, 1
-[{] LBRACE - 3, 1
-[
-
- ] S - 4, 5
-[color] DECLARATION_PROPERTY - 9, 5
-[:] DECLARATION_SEPARATOR - 14, 1
-[ ] S - 15, 1
-[white] DECLARATION_VALUE_IDENT - 16, 5
-[
- ] S - 21, 3
-[;] DECLARATION_DELIMITER - 24, 1
-[
-
- ] S - 25, 5
-[background-color] DECLARATION_PROPERTY - 30, 16
-[ ] S - 46, 1
-[:] DECLARATION_SEPARATOR - 47, 1
-[ ] S - 48, 1
-[black] DECLARATION_VALUE_IDENT - 49, 5
-[
-
-] S - 54, 5
-[}] RBRACE - 59, 1
-[
-] S - 60, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
deleted file mode 100644
index 34f6047..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
+++ /dev/null
@@ -1,73 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("hoge.css")] URI - 8, 15
-[;] DELIMITER - 23, 1
-[
-] S - 24, 2
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[/* comment */] COMMENT - 34, 13
-[ ] S - 47, 1
-[url(hoge.css)] URI - 48, 13
-[;] DELIMITER - 61, 1
-[
-] S - 62, 2
-[@import] IMPORT - 64, 7
-[ ] S - 71, 1
-["hoge.css"] STRING - 72, 10
-[ ] S - 82, 1
-[/* comment */] COMMENT - 83, 13
-[;] DELIMITER - 96, 1
-[
-] S - 97, 2
-[@IMPORT] IMPORT - 99, 7
-[ ] S - 106, 1
-['hoge.css'] STRING - 107, 10
-[ ] S - 117, 1
-[,] undefined - 118, 1
-[media1] MEDIUM - 119, 6
-[,] MEDIA_SEPARATOR - 125, 1
-[media2] MEDIUM - 126, 6
-[,] MEDIA_SEPARATOR - 132, 1
-[,] undefined - 133, 1
-[media3] MEDIUM - 134, 6
-[ ] S - 140, 1
-[m] undefined - 141, 1
-[e] undefined - 142, 1
-[d] undefined - 143, 1
-[i] undefined - 144, 1
-[a] undefined - 145, 1
-[4] undefined - 146, 1
-[,] MEDIA_SEPARATOR - 147, 1
-[media5] MEDIUM - 148, 6
-[ ] S - 154, 1
-[@import] IMPORT - 155, 7
-[ ] S - 162, 1
-[m] undefined - 163, 1
-[e] undefined - 164, 1
-[d] undefined - 165, 1
-[i] undefined - 166, 1
-[a] undefined - 167, 1
-[6] undefined - 168, 1
-[;] DELIMITER - 169, 1
-[
-
-] S - 170, 4
-[<!--] CDO - 174, 4
-[ ] S - 178, 1
-[/* hogehoge */] COMMENT - 179, 14
-[
-
-] S - 193, 4
-[-->] CDC - 197, 3
-[
-
-] S - 200, 4
-[/* comment 2 */] COMMENT - 204, 15
-[
-] S - 219, 2
-[kuso] SELECTOR_ELEMENT_NAME - 221, 4
-[
-] S - 225, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
deleted file mode 100644
index 3a3e11c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
+++ /dev/null
@@ -1,124 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("../sample2.css")] URI - 8, 21
-[;] DELIMITER - 29, 1
-[
-
-] S - 30, 4
-[/* Sample Styles */] COMMENT - 34, 19
-[
-
-] S - 53, 4
-[BODY] SELECTOR_ELEMENT_NAME - 57, 4
-[ ] S - 61, 1
-[{] LBRACE - 62, 1
-[
- ] S - 63, 3
-[color] DECLARATION_PROPERTY - 66, 5
-[ ] S - 71, 1
-[:] DECLARATION_SEPARATOR - 72, 1
-[ ] S - 73, 1
-[black] DECLARATION_VALUE_IDENT - 74, 5
-[;] DECLARATION_DELIMITER - 79, 1
-[
- ] S - 80, 3
-[background-color] DECLARATION_PROPERTY - 83, 16
-[ ] S - 99, 1
-[:] DECLARATION_SEPARATOR - 100, 1
-[ ] S - 101, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 102, 4
-[181] DECLARATION_VALUE_NUMBER - 106, 3
-[,] DECLARATION_VALUE_OPERATOR - 109, 1
-[ ] DECLARATION_VALUE_S - 110, 1
-[253] DECLARATION_VALUE_NUMBER - 111, 3
-[,] DECLARATION_VALUE_OPERATOR - 114, 1
-[ ] DECLARATION_VALUE_S - 115, 1
-[211] DECLARATION_VALUE_NUMBER - 116, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 119, 1
-[;] DECLARATION_DELIMITER - 120, 1
-[
- ] S - 121, 3
-[text-align] DECLARATION_PROPERTY - 124, 10
-[ ] S - 134, 1
-[:] DECLARATION_SEPARATOR - 135, 1
-[ ] S - 136, 1
-[center] DECLARATION_VALUE_IDENT - 137, 6
-[;] DECLARATION_DELIMITER - 143, 1
-[
- ] S - 144, 3
-[font-family] DECLARATION_PROPERTY - 147, 11
-[ ] S - 158, 1
-[:] DECLARATION_SEPARATOR - 159, 1
-[ ] S - 160, 1
-["Heisei Mincho W3"] DECLARATION_VALUE_STRING - 161, 18
-[,] DECLARATION_VALUE_OPERATOR - 179, 1
-[ ] DECLARATION_VALUE_S - 180, 1
-[serif] DECLARATION_VALUE_IDENT - 181, 5
-[
-] S - 186, 2
-[}] RBRACE - 188, 1
-[
-
-] S - 189, 4
-[@page] PAGE - 193, 5
-[ ] S - 198, 1
-[:left] CSS_PAGE_SELECTOR - 199, 5
-[ ] S - 204, 1
-[{] LBRACE - 205, 1
-[ ] S - 206, 1
-[margin-left] DECLARATION_PROPERTY - 207, 11
-[ ] S - 218, 1
-[:] DECLARATION_SEPARATOR - 219, 1
-[ ] S - 220, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 221, 3
-[ ] S - 224, 1
-[}] RBRACE - 225, 1
-[
-
-] S - 226, 4
-[@media] MEDIA - 230, 6
-[ ] S - 236, 1
-[aural] MEDIUM - 237, 5
-[ ] S - 242, 1
-[{] LBRACE - 243, 1
-[
- ] S - 244, 3
-[P] SELECTOR_ELEMENT_NAME - 247, 1
-[.heidi] SELECTOR_CLASS - 248, 6
-[ ] S - 254, 1
-[{] LBRACE - 255, 1
-[
- ] S - 256, 4
-[azimuth] DECLARATION_PROPERTY - 260, 7
-[ ] S - 267, 1
-[:] DECLARATION_SEPARATOR - 268, 1
-[ ] S - 269, 1
-[center-left] DECLARATION_VALUE_IDENT - 270, 11
-[;] DECLARATION_DELIMITER - 281, 1
-[
- ] S - 282, 4
-[elevation] DECLARATION_PROPERTY - 286, 9
-[ ] S - 295, 1
-[:] DECLARATION_SEPARATOR - 296, 1
-[ ] S - 297, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 298, 7
-[;] DECLARATION_DELIMITER - 305, 1
-[
- ] S - 306, 4
-[pause] DECLARATION_PROPERTY - 310, 5
-[ ] S - 315, 1
-[:] DECLARATION_SEPARATOR - 316, 1
-[ ] S - 317, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 318, 4
-[ ] DECLARATION_VALUE_S - 322, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 323, 4
-[
- ] S - 327, 3
-[}] RBRACE - 330, 1
-[
-] S - 331, 2
-[}] RBRACE - 333, 1
-[
-] S - 334, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
deleted file mode 100644
index 5d5d2e6..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[ ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[ ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[ ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[ ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[ ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[ ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[ ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[ ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[ ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[ ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[ ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[ ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[ ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[ ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[ ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[ ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[ ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[ ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[ ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[ ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[ ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[ ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[ ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[ ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[ ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[ ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[ ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[ ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[ ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[ ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[ ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[ ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[ ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[ ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[ ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[ ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[ ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[ ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[ ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[ ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[ ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[ ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[ ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[ ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[ ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[ ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[ ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[ ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[ ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[ ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[ ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[ ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[ ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[ ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[ ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[ ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[ ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[ ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[ ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[ ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[ ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[ ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
deleted file mode 100644
index 5d5d2e6..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[ ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[ ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[ ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[ ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[ ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[ ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[ ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[ ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[ ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[ ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[ ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[ ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[ ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[ ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[ ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[ ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[ ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[ ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[ ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[ ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[ ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[ ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[ ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[ ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[ ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[ ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[ ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[ ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[ ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[ ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[ ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[ ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[ ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[ ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[ ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[ ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[ ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[ ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[ ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[ ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[ ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[ ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[ ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[ ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[ ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[ ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[ ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[ ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[ ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[ ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[ ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[ ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[ ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[ ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[ ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[ ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[ ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[ ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[ ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[ ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[ ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[ ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
deleted file mode 100644
index 82217c0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
+++ /dev/null
@@ -1,101 +0,0 @@
-[declaration] SELECTOR_ELEMENT_NAME - 0, 11
-[ ] S - 11, 1
-[{] LBRACE - 12, 1
-[
- ] S - 13, 3
-[dimension] DECLARATION_PROPERTY - 16, 9
-[ ] S - 25, 1
-[:] DECLARATION_SEPARATOR - 26, 1
-[ ] S - 27, 1
-[100ex] DECLARATION_VALUE_DIMENSION - 28, 5
-[;] DECLARATION_DELIMITER - 33, 1
-[
- ] S - 34, 3
-[function] DECLARATION_PROPERTY - 37, 8
-[ ] S - 45, 1
-[:] DECLARATION_SEPARATOR - 46, 1
-[ ] S - 47, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 48, 5
-[100] DECLARATION_VALUE_NUMBER - 53, 3
-[,] DECLARATION_VALUE_OPERATOR - 56, 1
-[ ] DECLARATION_VALUE_S - 57, 1
-[200] DECLARATION_VALUE_NUMBER - 58, 3
-[,] DECLARATION_VALUE_OPERATOR - 61, 1
-[ ] DECLARATION_VALUE_S - 62, 1
-[300] DECLARATION_VALUE_NUMBER - 63, 3
-[,] DECLARATION_VALUE_OPERATOR - 66, 1
-[ ] DECLARATION_VALUE_S - 67, 1
-[400] DECLARATION_VALUE_NUMBER - 68, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 71, 1
-[,] DECLARATION_VALUE_OPERATOR - 72, 1
-[ ] DECLARATION_VALUE_S - 73, 1
-[format(] DECLARATION_VALUE_FUNCTION - 74, 7
-["intellifont"] DECLARATION_VALUE_STRING - 81, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 94, 1
-[,] DECLARATION_VALUE_OPERATOR - 95, 1
-[ ] DECLARATION_VALUE_S - 96, 1
-[local(] DECLARATION_VALUE_FUNCTION - 97, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 103, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 132, 1
-[;] DECLARATION_DELIMITER - 133, 1
-[
- ] S - 134, 3
-[hash] DECLARATION_PROPERTY - 137, 4
-[ ] S - 141, 1
-[:] DECLARATION_SEPARATOR - 142, 1
-[ ] S - 143, 1
-[#aabbcc] DECLARATION_VALUE_HASH - 144, 7
-[;] DECLARATION_DELIMITER - 151, 1
-[
- ] S - 152, 3
-[ident] DECLARATION_PROPERTY - 155, 5
-[ ] S - 160, 1
-[:] DECLARATION_SEPARATOR - 161, 1
-[ ] S - 162, 1
-[any] DECLARATION_VALUE_IDENT - 163, 3
-[;] DECLARATION_DELIMITER - 166, 1
-[
- ] S - 167, 3
-[number] DECLARATION_PROPERTY - 170, 6
-[ ] S - 176, 1
-[:] DECLARATION_SEPARATOR - 177, 1
-[ ] S - 178, 1
-[99999] DECLARATION_VALUE_NUMBER - 179, 5
-[;] DECLARATION_DELIMITER - 184, 1
-[
- ] S - 185, 3
-[percentage] DECLARATION_PROPERTY - 188, 10
-[ ] S - 198, 1
-[:] DECLARATION_SEPARATOR - 199, 1
-[ ] S - 200, 1
-[100%] DECLARATION_VALUE_PERCENTAGE - 201, 4
-[;] DECLARATION_DELIMITER - 205, 1
-[
- ] S - 206, 3
-[string] DECLARATION_PROPERTY - 209, 6
-[ ] S - 215, 1
-[:] DECLARATION_SEPARATOR - 216, 1
-[ ] S - 217, 1
-["string"] DECLARATION_VALUE_STRING - 218, 8
-[;] DECLARATION_DELIMITER - 226, 1
-[
- ] S - 227, 3
-[unicode-range] DECLARATION_PROPERTY - 230, 13
-[ ] S - 243, 1
-[:] DECLARATION_SEPARATOR - 244, 1
-[ ] S - 245, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 246, 4
-[,] DECLARATION_VALUE_OPERATOR - 250, 1
-[ ] DECLARATION_VALUE_S - 251, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 252, 9
-[,] DECLARATION_VALUE_OPERATOR - 261, 1
-[ ] DECLARATION_VALUE_S - 262, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 263, 5
-[;] DECLARATION_DELIMITER - 268, 1
-[
-] S - 269, 2
-[}] RBRACE - 271, 1
-[
-] S - 272, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
deleted file mode 100644
index ffed5b2..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
+++ /dev/null
@@ -1,583 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("../sample2.css")] URI - 34, 21
-[ ] S - 55, 1
-[projection] MEDIUM - 56, 10
-[,] MEDIA_SEPARATOR - 66, 1
-[ ] S - 67, 1
-[tv] MEDIUM - 68, 2
-[;] DELIMITER - 70, 1
-[
-
-] S - 71, 4
-[BODY] SELECTOR_ELEMENT_NAME - 75, 4
-[ ] S - 79, 1
-[{] LBRACE - 80, 1
-[
- ] S - 81, 6
-[color] DECLARATION_PROPERTY - 87, 5
-[ ] S - 92, 1
-[:] DECLARATION_SEPARATOR - 93, 1
-[ ] S - 94, 1
-[black] DECLARATION_VALUE_IDENT - 95, 5
-[;] DECLARATION_DELIMITER - 100, 1
-[
- ] S - 101, 6
-[text-align] DECLARATION_PROPERTY - 107, 10
-[ ] S - 117, 1
-[:] DECLARATION_SEPARATOR - 118, 1
-[ ] S - 119, 1
-[center] DECLARATION_VALUE_IDENT - 120, 6
-[;] DECLARATION_DELIMITER - 126, 1
-[
- ] S - 127, 6
-[background-color] DECLARATION_PROPERTY - 133, 16
-[ ] S - 149, 1
-[:] DECLARATION_SEPARATOR - 150, 1
-[ ] S - 151, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 152, 4
-[ ] DECLARATION_VALUE_S - 156, 1
-[181] DECLARATION_VALUE_NUMBER - 157, 3
-[,] DECLARATION_VALUE_OPERATOR - 160, 1
-[ ] DECLARATION_VALUE_S - 161, 1
-[253] DECLARATION_VALUE_NUMBER - 162, 3
-[,] DECLARATION_VALUE_OPERATOR - 165, 1
-[ ] DECLARATION_VALUE_S - 166, 1
-[211] DECLARATION_VALUE_NUMBER - 167, 3
-[ ] DECLARATION_VALUE_S - 170, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 171, 1
-[
-] S - 172, 2
-[}] RBRACE - 174, 1
-[
-
-] S - 175, 4
-[UL] SELECTOR_ELEMENT_NAME - 179, 2
-[ ] S - 181, 1
-[{] LBRACE - 182, 1
-[
- ] S - 183, 6
-[color] DECLARATION_PROPERTY - 189, 5
-[ ] S - 194, 1
-[:] DECLARATION_SEPARATOR - 195, 1
-[ ] S - 196, 1
-[black] DECLARATION_VALUE_IDENT - 197, 5
-[;] DECLARATION_DELIMITER - 202, 1
-[
- ] S - 203, 6
-[list-style-image] DECLARATION_PROPERTY - 209, 16
-[ ] S - 225, 1
-[:] DECLARATION_SEPARATOR - 226, 1
-[ ] S - 227, 1
-[url("images/l_a01.gif")] DECLARATION_VALUE_URI - 228, 23
-[;] DECLARATION_DELIMITER - 251, 1
-[
- ] S - 252, 6
-[list-style-position] DECLARATION_PROPERTY - 258, 19
-[ ] S - 277, 1
-[:] DECLARATION_SEPARATOR - 278, 1
-[ ] S - 279, 1
-[outside] DECLARATION_VALUE_IDENT - 280, 7
-[
-] S - 287, 2
-[}] RBRACE - 289, 1
-[
-
-] S - 290, 4
-[H1] SELECTOR_ELEMENT_NAME - 294, 2
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[
- ] S - 298, 6
-[color] DECLARATION_PROPERTY - 304, 5
-[ ] S - 309, 1
-[:] DECLARATION_SEPARATOR - 310, 1
-[ ] S - 311, 1
-[white] DECLARATION_VALUE_IDENT - 312, 5
-[;] DECLARATION_DELIMITER - 317, 1
-[
- ] S - 318, 6
-[text-align] DECLARATION_PROPERTY - 324, 10
-[ ] S - 334, 1
-[:] DECLARATION_SEPARATOR - 335, 1
-[ ] S - 336, 1
-[center] DECLARATION_VALUE_IDENT - 337, 6
-[;] DECLARATION_DELIMITER - 343, 1
-[
- ] S - 344, 6
-[border-left-color] DECLARATION_PROPERTY - 350, 17
-[ ] S - 367, 1
-[:] DECLARATION_SEPARATOR - 368, 1
-[ ] S - 369, 1
-[#996666] DECLARATION_VALUE_HASH - 370, 7
-[;] DECLARATION_DELIMITER - 377, 1
-[
- ] S - 378, 6
-[padding-top] DECLARATION_PROPERTY - 384, 11
-[ ] S - 395, 1
-[:] DECLARATION_SEPARATOR - 396, 1
-[ ] S - 397, 1
-[0px] DECLARATION_VALUE_DIMENSION - 398, 3
-[;] DECLARATION_DELIMITER - 401, 1
-[
- ] S - 402, 6
-[padding-right] DECLARATION_PROPERTY - 408, 13
-[ ] S - 421, 1
-[:] DECLARATION_SEPARATOR - 422, 1
-[ ] S - 423, 1
-[1cm] DECLARATION_VALUE_DIMENSION - 424, 3
-[;] DECLARATION_DELIMITER - 427, 1
-[
- ] S - 428, 6
-[padding-bottom] DECLARATION_PROPERTY - 434, 14
-[ ] S - 448, 1
-[:] DECLARATION_SEPARATOR - 449, 1
-[ ] S - 450, 1
-[2] DECLARATION_VALUE_NUMBER - 451, 1
-[;] DECLARATION_DELIMITER - 452, 1
-[
- ] S - 453, 6
-[padding-left] DECLARATION_PROPERTY - 459, 12
-[ ] S - 471, 1
-[:] DECLARATION_SEPARATOR - 472, 1
-[ ] S - 473, 1
-[3em] DECLARATION_VALUE_DIMENSION - 474, 3
-[;] DECLARATION_DELIMITER - 477, 1
-[
- ] S - 478, 6
-[border-style] DECLARATION_PROPERTY - 484, 12
-[ ] S - 496, 1
-[:] DECLARATION_SEPARATOR - 497, 1
-[ ] S - 498, 1
-[solid] DECLARATION_VALUE_IDENT - 499, 5
-[;] DECLARATION_DELIMITER - 504, 1
-[
- ] S - 505, 6
-[border-top-width] DECLARATION_PROPERTY - 511, 16
-[ ] S - 527, 1
-[:] DECLARATION_SEPARATOR - 528, 1
-[ ] S - 529, 1
-[4.5ex] DECLARATION_VALUE_DIMENSION - 530, 5
-[;] DECLARATION_DELIMITER - 535, 1
-[
- ] S - 536, 6
-[border-right-width] DECLARATION_PROPERTY - 542, 18
-[ ] S - 560, 1
-[:] DECLARATION_SEPARATOR - 561, 1
-[ ] S - 562, 1
-[5in] DECLARATION_VALUE_DIMENSION - 563, 3
-[;] DECLARATION_DELIMITER - 566, 1
-[
- ] S - 567, 6
-[border-bottom-width] DECLARATION_PROPERTY - 573, 19
-[ ] S - 592, 1
-[:] DECLARATION_SEPARATOR - 593, 1
-[ ] S - 594, 1
-[6.02mm] DECLARATION_VALUE_DIMENSION - 595, 6
-[;] DECLARATION_DELIMITER - 601, 1
-[
- ] S - 602, 6
-[border-left-width] DECLARATION_PROPERTY - 608, 17
-[ ] S - 625, 1
-[:] DECLARATION_SEPARATOR - 626, 1
-[ ] S - 627, 1
-[7] DECLARATION_VALUE_NUMBER - 628, 1
-[
-] S - 629, 2
-[}] RBRACE - 631, 1
-[
-
-] S - 632, 4
-[H1] SELECTOR_ELEMENT_NAME - 636, 2
-[:before] SELECTOR_PSEUDO - 638, 7
-[ ] S - 645, 1
-[{] LBRACE - 646, 1
-[
- ] S - 647, 6
-[content] DECLARATION_PROPERTY - 653, 7
-[ ] S - 660, 1
-[:] DECLARATION_SEPARATOR - 661, 1
-[ ] S - 662, 1
-["Chapter "] DECLARATION_VALUE_STRING - 663, 10
-[ ] DECLARATION_VALUE_S - 673, 1
-[counter(] DECLARATION_VALUE_FUNCTION - 674, 8
-[ ] DECLARATION_VALUE_S - 682, 1
-[chapter] DECLARATION_VALUE_IDENT - 683, 7
-[ ] DECLARATION_VALUE_S - 690, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 691, 1
-[ ] DECLARATION_VALUE_S - 692, 1
-[". "] DECLARATION_VALUE_STRING - 693, 4
-[;] DECLARATION_DELIMITER - 697, 1
-[
- ] S - 698, 6
-[counter-increment] DECLARATION_PROPERTY - 704, 17
-[ ] S - 721, 1
-[:] DECLARATION_SEPARATOR - 722, 1
-[ ] S - 723, 1
-[chapter] DECLARATION_VALUE_IDENT - 724, 7
-[;] DECLARATION_DELIMITER - 731, 1
-[
- ] S - 732, 6
-[counter-reset] DECLARATION_PROPERTY - 738, 13
-[ ] S - 751, 1
-[:] DECLARATION_SEPARATOR - 752, 1
-[ ] S - 753, 1
-[section] DECLARATION_VALUE_IDENT - 754, 7
-[
-] S - 761, 2
-[}] RBRACE - 763, 1
-[
-
-] S - 764, 4
-[IMG] SELECTOR_ELEMENT_NAME - 768, 3
-[:before] SELECTOR_PSEUDO - 771, 7
-[ ] S - 778, 1
-[{] LBRACE - 779, 1
-[content] DECLARATION_PROPERTY - 780, 7
-[ ] S - 787, 1
-[:] DECLARATION_SEPARATOR - 788, 1
-[ ] S - 789, 1
-[attr(] DECLARATION_VALUE_FUNCTION - 790, 5
-[alt] DECLARATION_VALUE_IDENT - 795, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 798, 1
-[}] RBRACE - 799, 1
-[
-
-] S - 800, 4
-[DIV] SELECTOR_ELEMENT_NAME - 804, 3
-[.sample] SELECTOR_CLASS - 807, 7
-[ ] S - 814, 1
-[{] LBRACE - 815, 1
-[
- ] S - 816, 6
-[font-family] DECLARATION_PROPERTY - 822, 11
-[ ] S - 833, 1
-[:] DECLARATION_SEPARATOR - 834, 1
-[ ] S - 835, 1
-["Robson Celtic"] DECLARATION_VALUE_STRING - 836, 15
-[,] DECLARATION_VALUE_OPERATOR - 851, 1
-[ ] DECLARATION_VALUE_S - 852, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 853, 10
-[;] DECLARATION_DELIMITER - 863, 1
-[
- ] S - 864, 6
-[position] DECLARATION_PROPERTY - 870, 8
-[ ] S - 878, 1
-[:] DECLARATION_SEPARATOR - 879, 1
-[ ] S - 880, 1
-[absolute] DECLARATION_VALUE_IDENT - 881, 8
-[;] DECLARATION_DELIMITER - 889, 1
-[
- ] S - 890, 6
-[left] DECLARATION_PROPERTY - 896, 4
-[ ] S - 900, 1
-[:] DECLARATION_SEPARATOR - 901, 1
-[ ] S - 902, 1
-[833.5pc] DECLARATION_VALUE_DIMENSION - 903, 7
-[;] DECLARATION_DELIMITER - 910, 1
-[
- ] S - 911, 6
-[top] DECLARATION_PROPERTY - 917, 3
-[ ] S - 920, 1
-[:] DECLARATION_SEPARATOR - 921, 1
-[ ] S - 922, 1
-[90%] DECLARATION_VALUE_PERCENTAGE - 923, 3
-[;] DECLARATION_DELIMITER - 926, 1
-[
- ] S - 927, 6
-[width] DECLARATION_PROPERTY - 933, 5
-[ ] S - 938, 1
-[:] DECLARATION_SEPARATOR - 939, 1
-[ ] S - 940, 1
-[100pt] DECLARATION_VALUE_DIMENSION - 941, 5
-[;] DECLARATION_DELIMITER - 946, 1
-[
- ] S - 947, 6
-[height] DECLARATION_PROPERTY - 953, 6
-[ ] S - 959, 1
-[:] DECLARATION_SEPARATOR - 960, 1
-[ ] S - 961, 1
-[110.777px] DECLARATION_VALUE_DIMENSION - 962, 9
-[;] DECLARATION_DELIMITER - 971, 1
-[
- ] S - 972, 6
-[clip] DECLARATION_PROPERTY - 978, 4
-[ ] S - 982, 1
-[:] DECLARATION_SEPARATOR - 983, 1
-[ ] S - 984, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 985, 5
-[ ] DECLARATION_VALUE_S - 990, 1
-[-5px] DECLARATION_VALUE_DIMENSION - 991, 4
-[,] DECLARATION_VALUE_OPERATOR - 995, 1
-[ ] DECLARATION_VALUE_S - 996, 1
-[80px] DECLARATION_VALUE_DIMENSION - 997, 4
-[,] DECLARATION_VALUE_OPERATOR - 1001, 1
-[ ] DECLARATION_VALUE_S - 1002, 1
-[130px] DECLARATION_VALUE_DIMENSION - 1003, 5
-[,] DECLARATION_VALUE_OPERATOR - 1008, 1
-[ ] DECLARATION_VALUE_S - 1009, 1
-[0px] DECLARATION_VALUE_DIMENSION - 1010, 3
-[ ] DECLARATION_VALUE_S - 1013, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1014, 1
-[
-] S - 1015, 2
-[}] RBRACE - 1017, 1
-[
-
-] S - 1018, 4
-[@font-face] FONT_FACE - 1022, 10
-[ ] S - 1032, 1
-[{] LBRACE - 1033, 1
-[
- ] S - 1034, 6
-[font-family] DECLARATION_PROPERTY - 1040, 11
-[ ] S - 1051, 1
-[:] DECLARATION_SEPARATOR - 1052, 1
-[ ] S - 1053, 1
-["Swiss 721"] DECLARATION_VALUE_STRING - 1054, 11
-[;] DECLARATION_DELIMITER - 1065, 1
-[
- ] S - 1066, 6
-[src] DECLARATION_PROPERTY - 1072, 3
-[ ] S - 1075, 1
-[:] DECLARATION_SEPARATOR - 1076, 1
-[ ] S - 1077, 1
-[url("swiss721t.pfr")] DECLARATION_VALUE_URI - 1078, 20
-[ ] DECLARATION_VALUE_S - 1098, 1
-[format(] DECLARATION_VALUE_FUNCTION - 1099, 7
-["intellifont"] DECLARATION_VALUE_STRING - 1106, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1119, 1
-[,] DECLARATION_VALUE_OPERATOR - 1120, 1
-[ ] DECLARATION_VALUE_S - 1121, 1
-[local(] DECLARATION_VALUE_FUNCTION - 1122, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 1128, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1157, 1
-[;] DECLARATION_DELIMITER - 1158, 1
-[
- ] S - 1159, 6
-[unicode-range] DECLARATION_PROPERTY - 1165, 13
-[ ] S - 1178, 1
-[:] DECLARATION_SEPARATOR - 1179, 1
-[ ] S - 1180, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 1181, 4
-[,] DECLARATION_VALUE_OPERATOR - 1185, 1
-[ ] DECLARATION_VALUE_S - 1186, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 1187, 9
-[,] DECLARATION_VALUE_OPERATOR - 1196, 1
-[ ] DECLARATION_VALUE_S - 1197, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 1198, 5
-[;] DECLARATION_DELIMITER - 1203, 1
-[
- ] S - 1204, 6
-[font-weight] DECLARATION_PROPERTY - 1210, 11
-[ ] S - 1221, 1
-[:] DECLARATION_SEPARATOR - 1222, 1
-[ ] S - 1223, 1
-[100] DECLARATION_VALUE_NUMBER - 1224, 3
-[,] DECLARATION_VALUE_OPERATOR - 1227, 1
-[ ] DECLARATION_VALUE_S - 1228, 1
-[200] DECLARATION_VALUE_NUMBER - 1229, 3
-[,] DECLARATION_VALUE_OPERATOR - 1232, 1
-[ ] DECLARATION_VALUE_S - 1233, 1
-[300] DECLARATION_VALUE_NUMBER - 1234, 3
-[,] DECLARATION_VALUE_OPERATOR - 1237, 1
-[ ] DECLARATION_VALUE_S - 1238, 1
-[400] DECLARATION_VALUE_NUMBER - 1239, 3
-[,] DECLARATION_VALUE_OPERATOR - 1242, 1
-[ ] DECLARATION_VALUE_S - 1243, 1
-[500] DECLARATION_VALUE_NUMBER - 1244, 3
-[
-] S - 1247, 2
-[}] RBRACE - 1249, 1
-[
-
-] S - 1250, 4
-[@page] PAGE - 1254, 5
-[ ] S - 1259, 1
-[:left] CSS_PAGE_SELECTOR - 1260, 5
-[ ] S - 1265, 1
-[{] LBRACE - 1266, 1
-[margin-left] DECLARATION_PROPERTY - 1267, 11
-[ ] S - 1278, 1
-[:] DECLARATION_SEPARATOR - 1279, 1
-[ ] S - 1280, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 1281, 3
-[}] RBRACE - 1284, 1
-[
-
-] S - 1285, 4
-[@media] MEDIA - 1289, 6
-[ ] S - 1295, 1
-[aural] MEDIUM - 1296, 5
-[ ] S - 1301, 1
-[{] LBRACE - 1302, 1
-[
- ] S - 1303, 6
-[H1] SELECTOR_ELEMENT_NAME - 1309, 2
-[,] SELECTOR_SEPARATOR - 1311, 1
-[ ] S - 1312, 1
-[H2] SELECTOR_ELEMENT_NAME - 1313, 2
-[,] SELECTOR_SEPARATOR - 1315, 1
-[ ] S - 1316, 1
-[H3] SELECTOR_ELEMENT_NAME - 1317, 2
-[,] SELECTOR_SEPARATOR - 1319, 1
-[ ] S - 1320, 1
-[H4] SELECTOR_ELEMENT_NAME - 1321, 2
-[,] SELECTOR_SEPARATOR - 1323, 1
-[ ] S - 1324, 1
-[H5] SELECTOR_ELEMENT_NAME - 1325, 2
-[,] SELECTOR_SEPARATOR - 1327, 1
-[ ] S - 1328, 1
-[H6] SELECTOR_ELEMENT_NAME - 1329, 2
-[ ] S - 1331, 1
-[{] LBRACE - 1332, 1
-[
- ] S - 1333, 10
-[voice-family] DECLARATION_PROPERTY - 1343, 12
-[ ] S - 1355, 1
-[:] DECLARATION_SEPARATOR - 1356, 1
-[ ] S - 1357, 1
-[paul] DECLARATION_VALUE_IDENT - 1358, 4
-[,] DECLARATION_VALUE_OPERATOR - 1362, 1
-[ ] DECLARATION_VALUE_S - 1363, 1
-[child] DECLARATION_VALUE_IDENT - 1364, 5
-[;] DECLARATION_DELIMITER - 1369, 1
-[
- ] S - 1370, 10
-[stress] DECLARATION_PROPERTY - 1380, 6
-[ ] S - 1386, 1
-[:] DECLARATION_SEPARATOR - 1387, 1
-[ ] S - 1388, 1
-[20] DECLARATION_VALUE_NUMBER - 1389, 2
-[;] DECLARATION_DELIMITER - 1391, 1
-[
- ] S - 1392, 10
-[richness] DECLARATION_PROPERTY - 1402, 8
-[ ] S - 1410, 1
-[:] DECLARATION_SEPARATOR - 1411, 1
-[ ] S - 1412, 1
-[90] DECLARATION_VALUE_NUMBER - 1413, 2
-[;] DECLARATION_DELIMITER - 1415, 1
-[
- ] S - 1416, 10
-[cue-before] DECLARATION_PROPERTY - 1426, 10
-[ ] S - 1436, 1
-[:] DECLARATION_SEPARATOR - 1437, 1
-[ ] S - 1438, 1
-[url("ping.au")] DECLARATION_VALUE_URI - 1439, 14
-[
- ] S - 1453, 6
-[}] RBRACE - 1459, 1
-[
- ] S - 1460, 6
-[P] SELECTOR_ELEMENT_NAME - 1466, 1
-[.heidi] SELECTOR_CLASS - 1467, 6
-[ ] S - 1473, 1
-[{] LBRACE - 1474, 1
-[
- ] S - 1475, 10
-[azimuth] DECLARATION_PROPERTY - 1485, 7
-[ ] S - 1492, 1
-[:] DECLARATION_SEPARATOR - 1493, 1
-[ ] S - 1494, 1
-[center-left] DECLARATION_VALUE_IDENT - 1495, 11
-[;] DECLARATION_DELIMITER - 1506, 1
-[
- ] S - 1507, 10
-[elevation] DECLARATION_PROPERTY - 1517, 9
-[ ] S - 1526, 1
-[:] DECLARATION_SEPARATOR - 1527, 1
-[ ] S - 1528, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 1529, 7
-[;] DECLARATION_DELIMITER - 1536, 1
-[
- ] S - 1537, 10
-[pause] DECLARATION_PROPERTY - 1547, 5
-[ ] S - 1552, 1
-[:] DECLARATION_SEPARATOR - 1553, 1
-[ ] S - 1554, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 1555, 4
-[ ] DECLARATION_VALUE_S - 1559, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 1560, 4
-[
- ] S - 1564, 6
-[}] RBRACE - 1570, 1
-[
- ] S - 1571, 6
-[P] SELECTOR_ELEMENT_NAME - 1577, 1
-[.peter] SELECTOR_CLASS - 1578, 6
-[ ] S - 1584, 1
-[{] LBRACE - 1585, 1
-[
- ] S - 1586, 10
-[azimuth] DECLARATION_PROPERTY - 1596, 7
-[ ] S - 1603, 1
-[:] DECLARATION_SEPARATOR - 1604, 1
-[ ] S - 1605, 1
-[right] DECLARATION_VALUE_IDENT - 1606, 5
-[;] DECLARATION_DELIMITER - 1611, 1
-[
- ] S - 1612, 10
-[elevation] DECLARATION_PROPERTY - 1622, 9
-[ ] S - 1631, 1
-[:] DECLARATION_SEPARATOR - 1632, 1
-[ ] S - 1633, 1
-[-0.36rad] DECLARATION_VALUE_DIMENSION - 1634, 8
-[;] DECLARATION_DELIMITER - 1642, 1
-[
- ] S - 1643, 10
-[pitch] DECLARATION_PROPERTY - 1653, 5
-[ ] S - 1658, 1
-[:] DECLARATION_SEPARATOR - 1659, 1
-[ ] S - 1660, 1
-[210Hz] DECLARATION_VALUE_DIMENSION - 1661, 5
-[
- ] S - 1666, 6
-[}] RBRACE - 1672, 1
-[
- ] S - 1673, 6
-[P] SELECTOR_ELEMENT_NAME - 1679, 1
-[.goat] SELECTOR_CLASS - 1680, 5
-[ ] S - 1685, 1
-[{] LBRACE - 1686, 1
-[
- ] S - 1687, 10
-[volume] DECLARATION_PROPERTY - 1697, 6
-[ ] S - 1703, 1
-[:] DECLARATION_SEPARATOR - 1704, 1
-[ ] S - 1705, 1
-[x-soft] DECLARATION_VALUE_IDENT - 1706, 6
-[;] DECLARATION_DELIMITER - 1712, 1
-[
- ] S - 1713, 10
-[elevation] DECLARATION_PROPERTY - 1723, 9
-[ ] S - 1732, 1
-[:] DECLARATION_SEPARATOR - 1733, 1
-[ ] S - 1734, 1
-[66grad] DECLARATION_VALUE_DIMENSION - 1735, 6
-[;] DECLARATION_DELIMITER - 1741, 1
-[
- ] S - 1742, 10
-[pitch] DECLARATION_PROPERTY - 1752, 5
-[ ] S - 1757, 1
-[:] DECLARATION_SEPARATOR - 1758, 1
-[ ] S - 1759, 1
-[0.17kHz] DECLARATION_VALUE_DIMENSION - 1760, 7
-[
- ] S - 1767, 6
-[}] RBRACE - 1773, 1
-[
-] S - 1774, 2
-[}] RBRACE - 1776, 1
-[
-
-] S - 1777, 4
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css
deleted file mode 100644
index 00dbff4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample08.css
+++ /dev/null
@@ -1,22 +0,0 @@
-[a] SELECTOR_ELEMENT_NAME - 0, 1
-[.newWindow] SELECTOR_CLASS - 1, 10
-[ ] S - 11, 1
-[/* */] COMMENT - 12, 5
-[ ] S - 17, 1
-[{] LBRACE - 18, 1
-[
- ] S - 19, 6
-[background-image] DECLARATION_PROPERTY - 25, 16
-[:] DECLARATION_SEPARATOR - 41, 1
-[ ] S - 42, 1
-[url(../images/test.png)] DECLARATION_VALUE_URI - 43, 23
-[ ] DECLARATION_VALUE_S - 66, 1
-[!important] CSS_DECLARATION_VALUE_IMPORTANT - 67, 10
-[;] DECLARATION_DELIMITER - 77, 1
-[
-] S - 78, 2
-[}] RBRACE - 80, 1
-[
-] S - 81, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
deleted file mode 100644
index 3c89826..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
+++ /dev/null
@@ -1,8 +0,0 @@
-H1 {
-
- color: white
- ;
-
- background-color : black
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
deleted file mode 100644
index 5a4c4dd..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 @import media6;
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-kuso
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
deleted file mode 100644
index e57ccc0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@import url("../sample2.css");
-
-/* Sample Styles */
-
-BODY {
- color : black;
- background-color : rgb(181, 253, 211);
- text-align : center;
- font-family : "Heisei Mincho W3", serif
-}
-
-@page :left { margin-left : 4cm }
-
-@media aural {
- P.heidi {
- azimuth : center-left;
- elevation : 12.3deg;
- pause : 30ms 1.6s
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
deleted file mode 100644
index d2de4f4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 { font-family: sans-serif }
-h1 em { color: blue }
-div p *[href] { color: blue }
-body > P { line-height: 1.3 }
-div ol>li p { }
-math + p { text-indent: 0 }
-h1.opener + h2 { margin-top: -5mm }
-h1[title] { color: blue; }
-span[class=example] { color: blue; }
-span[hello="Cleveland"][goodbye="Columbus"] { color: blue; }
-a[rel~="copyright"] { color: blue }
-a[href="http://www.w3.org/"] { color: blue }
-*[lang=fr] { display : none }
-*[lang|="en"] { color : red }
-DIALOGUE[character=romeo]
-{ voice-family: "Lawrence Olivier", charles, male }
-DIALOGUE[ character = juliet ]
-{ voice-family: "Vivien Leigh", victoria, female }
-*.pastoral { color: green }
-.pastoral { color: green }
-H1.pastoral { color: green }
-p.pastoral.marine { color: green }
-h1#chapter1 { text-align: center }
-div > p:first-child { text-indent: 0 }
-p:first-child em { font-weight : bold }
-* > a:first-child { font-weight : bold }
-a:first-child { font-weight : bold }
-a.external:visited { color: blue }
-a:focus:hover { background: white }
-html:lang(fr) { quotes: '<<' '>>' }
-html:lang(de) { quotes: '>>' '<<' '\2039' '\203A' }
-:lang(fr) > Q { quotes: '<<' '>>' }
-:lang(de) > Q { quotes: '>>' '<<' '\2039' '\203A' }
-p:first-letter { font-size: 3em; font-weight: normal }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
deleted file mode 100644
index d2de4f4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 { font-family: sans-serif }
-h1 em { color: blue }
-div p *[href] { color: blue }
-body > P { line-height: 1.3 }
-div ol>li p { }
-math + p { text-indent: 0 }
-h1.opener + h2 { margin-top: -5mm }
-h1[title] { color: blue; }
-span[class=example] { color: blue; }
-span[hello="Cleveland"][goodbye="Columbus"] { color: blue; }
-a[rel~="copyright"] { color: blue }
-a[href="http://www.w3.org/"] { color: blue }
-*[lang=fr] { display : none }
-*[lang|="en"] { color : red }
-DIALOGUE[character=romeo]
-{ voice-family: "Lawrence Olivier", charles, male }
-DIALOGUE[ character = juliet ]
-{ voice-family: "Vivien Leigh", victoria, female }
-*.pastoral { color: green }
-.pastoral { color: green }
-H1.pastoral { color: green }
-p.pastoral.marine { color: green }
-h1#chapter1 { text-align: center }
-div > p:first-child { text-indent: 0 }
-p:first-child em { font-weight : bold }
-* > a:first-child { font-weight : bold }
-a:first-child { font-weight : bold }
-a.external:visited { color: blue }
-a:focus:hover { background: white }
-html:lang(fr) { quotes: '<<' '>>' }
-html:lang(de) { quotes: '>>' '<<' '\2039' '\203A' }
-:lang(fr) > Q { quotes: '<<' '>>' }
-:lang(de) > Q { quotes: '>>' '<<' '\2039' '\203A' }
-p:first-letter { font-size: 3em; font-weight: normal }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
deleted file mode 100644
index ea73cea..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
+++ /dev/null
@@ -1,10 +0,0 @@
-declaration {
- dimension : 100ex;
- function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright");
- hash : #aabbcc;
- ident : any;
- number : 99999;
- percentage : 100%;
- string : "string";
- unicode-range : U+??, U+100-220, U+4??;
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
deleted file mode 100644
index fd34729..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
+++ /dev/null
@@ -1,82 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("../sample2.css") projection, tv;
-
-BODY {
- color : black;
- text-align : center;
- background-color : rgb( 181, 253, 211 )
-}
-
-UL {
- color : black;
- list-style-image : url("images/l_a01.gif");
- list-style-position : outside
-}
-
-H1 {
- color : white;
- text-align : center;
- border-left-color : #996666;
- padding-top : 0px;
- padding-right : 1cm;
- padding-bottom : 2;
- padding-left : 3em;
- border-style : solid;
- border-top-width : 4.5ex;
- border-right-width : 5in;
- border-bottom-width : 6.02mm;
- border-left-width : 7
-}
-
-H1:before {
- content : "Chapter " counter( chapter ) ". ";
- counter-increment : chapter;
- counter-reset : section
-}
-
-IMG:before {content : attr(alt)}
-
-DIV.sample {
- font-family : "Robson Celtic", sans-serif;
- position : absolute;
- left : 833.5pc;
- top : 90%;
- width : 100pt;
- height : 110.777px;
- clip : rect( -5px, 80px, 130px, 0px )
-}
-
-@font-face {
- font-family : "Swiss 721";
- src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright");
- unicode-range : U+??, U+100-220, U+4??;
- font-weight : 100, 200, 300, 400, 500
-}
-
-@page :left {margin-left : 4cm}
-
-@media aural {
- H1, H2, H3, H4, H5, H6 {
- voice-family : paul, child;
- stress : 20;
- richness : 90;
- cue-before : url("ping.au")
- }
- P.heidi {
- azimuth : center-left;
- elevation : 12.3deg;
- pause : 30ms 1.6s
- }
- P.peter {
- azimuth : right;
- elevation : -0.36rad;
- pitch : 210Hz
- }
- P.goat {
- volume : x-soft;
- elevation : 66grad;
- pitch : 0.17kHz
- }
-}
-
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css
deleted file mode 100644
index 5d19a7c..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample08.css
+++ /dev/null
@@ -1,3 +0,0 @@
-a.newWindow /* */ {
- background-image: url(../images/test.png) !important;
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
deleted file mode 100644
index cdf6bd5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.css.core.tests.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.osgi.framework.Bundle;
-
-/**
- *
- */
-public class FileUtil {
- public static final String commonEOL = "\r\n";
-
- public static File createFile(String directory, String filename) throws IOException {
- Bundle bundle = Platform.getBundle("org.eclipse.wst.css.core.tests"); //$NON-NLS-1$
- URL url = bundle.getEntry("/"); //$NON-NLS-1$
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
- URL totalURL = new URL(url, totalPath);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- return file;
- }
-
- // public static Reader createReader(File file) throws
- // FileNotFoundException {
- // return new FileReader(file);
- // }
- //
- // public static Reader createReader(String directory, String filename)
- // throws IOException {
- // File file = createFile(directory, filename);
- // return createReader(file);
- // }
-
- public static String createString(String directory, String filename) throws FileNotFoundException, IOException {
- StringBuffer buf = new StringBuffer();
- Reader fileReader = new FileReader(createFile(directory, filename));
- BufferedReader reader = new BufferedReader(fileReader);
- String line;
- while ((line = reader.readLine()) != null) {
- buf.append(line);
- buf.append(commonEOL);
- }
- return buf.toString();
- // return new DataInputStream(new
- // FileInputStream(createFile(directory, filename))).readUTF();
- }
-
- static int uniqueNum = 0;
-
- public static ICSSModel createModel() {
- IStructuredModel model = null;
- try {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit("test" + uniqueNum++ + ".css", new NullInputStream(), null); //$NON-NLS-1$
-
- // always use the same line delimiter for these tests, regardless
- // of plaform or preference settings
- model.getStructuredDocument().setLineDelimiter(commonEOL);
-
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return (ICSSModel) model;
-
- }
-
- public static void dumpString(String string, String directory, String filename) throws IOException {
- File file = createFile(directory, filename);
- Writer writer = new FileWriter(file);
- writer.write(string);
- writer.close();
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
deleted file mode 100644
index b4ee9e8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#mark(int)
- */
- public synchronized void mark(int readlimit) {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#markSupported()
- */
- public boolean markSupported() {
- // we can mark nothing.
- // and, we are using this Null class specifically for
- // a "fake" resettable stream.
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
-
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#reset()
- */
- public synchronized void reset() throws IOException {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#skip(long)
- */
- public long skip(long n) throws IOException {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index d4b3723..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml
deleted file mode 100644
index d653a3d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.css.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.project b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.project
deleted file mode 100644
index 0dea6fe..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>testImports</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 327dcc4..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="testImports">
- <wb-resource deploy-path="/" source-path="/WebContent"/>
- <property name="context-root" value="testImports"/>
- </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index f7f77fa..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="wst.web"/>
- <installed facet="wst.web" version="1.0"/>
-</faceted-project>
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/base.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/base.css
deleted file mode 100644
index a58e3ab..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/base.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#content {
- width: 750px;
- margin: 0 auto;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle0.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle0.css
deleted file mode 100644
index ed5ca24..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle0.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@import url("cycle1.css");
-#cycle0 {
- color: red;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle1.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle1.css
deleted file mode 100644
index 930e567..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle1.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@import url("cycle2.css");
-#cycle1 {
- color: blue;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle2.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle2.css
deleted file mode 100644
index ae25edb..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/cycle2.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@import url("cycle0.css");
-#cycle2 {
- color: black;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importDNE.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importDNE.css
deleted file mode 100644
index 001d3d3..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importDNE.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("thisfiledoesntexist.css");
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importMethods.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importMethods.css
deleted file mode 100644
index 6d3f921..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/importMethods.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@import url("base.css");
-@import url(base.css);
-@import "base.css";
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/site.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/site.css
deleted file mode 100644
index 57b2eeb..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/site.css
+++ /dev/null
@@ -1,10 +0,0 @@
-@import url("base.css");
-
-a {
- text-decoration: none;
- color: blue;
-}
-
-a:hover {
- text-decoration: underline;
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/style/sub.css b/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/style/sub.css
deleted file mode 100644
index c14c947..0000000
--- a/tests/org.eclipse.wst.css.core.tests/testfiles/testImports/WebContent/style/sub.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("../base.css");
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.classpath b/tests/org.eclipse.wst.css.tests.encoding/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore b/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
deleted file mode 100644
index f8471d8..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-cssencodingtests.jar
-javaCompiler.cssencodingtests.jar.args
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.project b/tests/org.eclipse.wst.css.tests.encoding/.project
deleted file mode 100644
index ea358d5..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.css.tests.encoding</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.css.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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.css.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.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.css.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index ec374cc..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.tests.encoding
-Bundle-Version: 1.0.600.qualifier
-Bundle-ClassPath: cssencodingtests.jar
-Bundle-Activator: org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.tests.encoding,
- org.eclipse.wst.css.tests.encoding.css
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.core,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.css.tests.encoding/about.html b/tests/org.eclipse.wst.css.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/build.properties b/tests/org.eclipse.wst.css.tests.encoding/build.properties
deleted file mode 100644
index 3c69e51..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-###############################################################################
-bin.includes = cssencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = cssencodingtests.jar
-source.cssencodingtests.jar = src/
-output.cssencodingtests.jar = bin/
-
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties b/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
deleted file mode 100644
index 334342c..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.css.tests.encoding
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = CSS Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
deleted file mode 100644
index 290d54b..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.tests.encoding.css.CSSEncodingTester;
-import org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester;
-import org.eclipse.wst.css.tests.encoding.css.TestContentTypeDetectionForCSS;
-
-public class CSSEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{CSSEncodingTester.class, CSSHeadTokenizerTester.class, TestContentTypeDetectionForCSS.class};
-
- public static Test suite() {
- return new CSSEncodingTestSuite();
- }
-
- public CSSEncodingTestSuite() {
- super("CSS Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public CSSEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public CSSEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public CSSEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
deleted file mode 100644
index da799c0..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.css.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static CSSEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static CSSEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.css.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = CSSEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public CSSEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
deleted file mode 100644
index 94e48ca..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 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.css.tests.encoding.css;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSResourceEncodingDetector;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class CSSEncodingTester extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
- private boolean DEBUG = false;
- private final String fileDir = "css/";
- // private final String pluginLocation =
- // TestsPlugin.getInstallLocation().toString();
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = CSSEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((CSSResourceEncodingDetector)detector).getEncodingMemento();
-
- String foundIANAEncoding = null;
-
- if (encodingMemento != null) {
- foundIANAEncoding = encodingMemento.getDetectedCharsetName();
- }
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- if (expectedIANAEncoding == null) {
- expectedIANAResult = expectedIANAEncoding == foundIANAEncoding;
- }
- else {
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
- }
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if
- // throws exception.
- if (foundIANAEncoding != null) {
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inputStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inputStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testBestCase() throws IOException {
- String filename = fileLocation + "nonStandard.css";
- doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-
- }
-
- public void testEmptyFile() throws IOException {
- String filename = fileLocation + "emptyFile.css";
- doTestFileStream(filename, null, new CSSResourceEncodingDetector());
- }
-
- public void testEUCJP() throws IOException {
- String filename = fileLocation + "encoding_test_eucjp.css";
- doTestFileStream(filename, "EUC-JP", new CSSResourceEncodingDetector());
- }
-
- public void testJIS() throws IOException {
- String filename = fileLocation + "encoding_test_jis.css";
- doTestFileStream(filename, "ISO-2022-JP", new CSSResourceEncodingDetector());
- }
-
- public void testNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.css";
- doTestFileStream(filename, null, new CSSResourceEncodingDetector());
- }
-
- public void testnonStandardIllFormed() throws IOException {
- String filename = fileLocation + "nonStandardIllFormed.css";
- doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
- }
-
- public void testnonStandardIllFormed2() throws IOException {
- String filename = fileLocation + "nonStandardIllFormed2.css";
- doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
- }
-
- public void testShiftJIS() throws IOException {
- String filename = fileLocation + "encoding_test_sjis.css";
- doTestFileStream(filename, "SHIFT_JIS", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.css";
- doTestFileStream(filename, "UTF-16BE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.css";
- doTestFileStream(filename, "UTF-16LE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16beMalformed() throws IOException {
- String filename = fileLocation + "utf16beMalformed.css";
- doTestFileStream(filename, "UTF-16BE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16leMalformed() throws IOException {
- String filename = fileLocation + "utf16leMalformed.css";
- doTestFileStream(filename, "UTF-16LE", new CSSResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = fileLocation + "utf16BOM.css";
- doTestFileStream(filename, "UTF-16", new CSSResourceEncodingDetector());
- }
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
deleted file mode 100644
index 1260302..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.css.tests.encoding.css;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer;
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizerConstants;
-import org.eclipse.wst.css.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-
-public class CSSHeadTokenizerTester extends TestCase {
- boolean DEBUG = false;
- private String fcharset;
- private final String fileDir = "css/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = this.fileHome + this.fileDir;
-
- private void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType) {
- try {
- doTestFile(CSSEncodingTestsPlugin.getTestReader(filename), expectedName, finalTokenType);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename +"\"");
- }
- }
-
- private void doTestFile(Reader fileReader, String expectedName, String finalTokenType) throws IOException {
- CSSHeadTokenizer tokenizer = null;
- tokenizer = new CSSHeadTokenizer(fileReader);
-
- HeadParserToken resultToken = null;
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = this.fcharset;
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
- else {
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
- }
-
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType == null) {
- result = false;
- }
- else {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(CSSHeadTokenizer tokenizer) throws IOException {
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- if (tokenType == CSSHeadTokenizerConstants.CHARSET_RULE) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- this.fcharset = valueToken.getText();
-
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- finalToken = token;
- return finalToken;
-
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fcharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fcharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws IOException {
- String filename = this.fileLocation + "nonStandard.css";
- doTestFile(filename, "ISO-8859-6");
-
- }
-
- public void testEmptyFile() throws IOException {
- String filename = this.fileLocation + "emptyFile.css";
- doTestFile(filename, null);
- }
-
- public void _testEUCJP() throws IOException {
- String filename = this.fileLocation + "encoding_test_eucjp.css";
- doTestFile(filename, "EUC-JP");
- }
-
- public void testJIS() throws IOException {
- String filename = this.fileLocation + "encoding_test_jis.css";
- doTestFile(filename, "ISO-2022-JP");
- }
-
- public void testNoEncoding() throws IOException {
- String filename = this.fileLocation + "noEncoding.css";
- doTestFile(filename, null);
- }
-
- public void testnonStandardIllFormed() throws IOException {
- String filename = this.fileLocation + "nonStandardIllFormed.css";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testnonStandardIllFormed2() throws IOException {
- String filename = this.fileLocation + "nonStandardIllFormed2.css";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void _testShiftJIS() throws IOException {
- String filename = this.fileLocation + "encoding_test_sjis.css";
- doTestFile(filename, "SHIFT_JIS");
- }
-
- public void testUTF16be() throws IOException {
- String filename = fileLocation + "utf16be.css";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16le() throws IOException {
- String filename = fileLocation + "utf16le.css";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16beMalformed() throws IOException {
- String filename = fileLocation + "utf16beMalformed.css";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16leMalformed() throws IOException {
- String filename = fileLocation + "utf16leMalformed.css";
- doTestFile(filename, "UTF-16LE");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer.yy_advance(CSSHeadTokenizer.java:337)
- at org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer.primGetNextToken(CSSHeadTokenizer.java:470)
- at org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer.getNextToken(CSSHeadTokenizer.java:229)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.parseHeader(CSSHeadTokenizerTester.java:88)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.doTestFile(CSSHeadTokenizerTester.java:52)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.doTestFile(CSSHeadTokenizerTester.java:31)
- at org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester.testUTF16BOM(CSSHeadTokenizerTester.java:186)
- */
-
- public void testUTF16BOM() throws Exception {
- /*String filename = fileLocation + "utf16BOM.css";
- ZippedTest test = new ZippedTest();
- test.setUp();
- IFile file = test.getFile(filename);
- assertNotNull(file);
- Reader fileReader = new FileReader(file.getLocationURI().getPath());
- doTestFile(fileReader, "UTF-16", null);
- test.shutDown();*/
- }
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
deleted file mode 100644
index c4144a7..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding.css;
-
-
-public interface EncodingParserConstants {
-
- final String EOF = "EOF"; //$NON-NLS-1$
- final String InvalidTerminatedStringValue = "InvalidTerminatedStringValue"; //$NON-NLS-1$
- final String InvalidTermintatedUnDelimitedStringValue = "InvalidTermintatedUnDelimitedStringValue"; //$NON-NLS-1$
- final String MAX_CHARS_REACHED = "MAX_CHARS_REACHED"; //$NON-NLS-1$
- final String StringValue = "strval"; //$NON-NLS-1$
- final String UnDelimitedStringValue = "UnDelimitedStringValue"; //$NON-NLS-1$
- public final String UTF16BE = "UTF16BE"; //$NON-NLS-1$
- public final String UTF16LE = "UTF16LE"; //$NON-NLS-1$
-
-
- public final String UTF83ByteBOM = "UTF83ByteBOM"; //$NON-NLS-1$
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
deleted file mode 100644
index 515d159..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 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.css.tests.encoding.css;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForCSS extends TestContentTypeDetection {
- public void testFile7() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile1001() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/emptyFile.css", null);
- }
-
- public void testFile1002() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_eucjp.css", null);
- }
-
- public void testFile1003() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_jis.css", null);
- }
-
- public void testFile4() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_sjis.css", null);
- }
-
-
- public void testFile5() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/noEncoding.css", null);
- }
-
- public void testFile6() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandard.css", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
- public void testUTF16be() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16be.css", null);
- }
-
- public void testUTF16le() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16le.css", null);
- }
-
- public void testUTF16beMalformed() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16beMalformed.css", null);
- }
-
- public void testUTF16leMalformed() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16leMalformed.css", null);
- }
-
- public void testUTF16BOM() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/utf16BOM.css", null);
- }
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/test.xml b/tests/org.eclipse.wst.css.tests.encoding/test.xml
deleted file mode 100644
index 8d65337..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.css.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
deleted file mode 100644
index 1e256e7..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "EUC-JP";
-
-BODY {
- font-family : "£Í£Ó £Ð¥´¥·¥Ã¥¯";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
deleted file mode 100644
index 384768b..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-2022-JP";
-
-BODY {
- font-family : "$B#M#S(B $B#P%4%7%C%/(B";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
deleted file mode 100644
index e529cda..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "SHIFT_JIS";
-
-BODY {
- font-family : "lr oSVbN";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
deleted file mode 100644
index f3f06bc..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
+++ /dev/null
@@ -1,46 +0,0 @@
-BODY {
- font-family: "Times New Roman", "MS Sans Serif";
- text-decoration: none;
- background-color: white;
-}
-
-TD {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- text-align: left;
-}
-
-TH {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: left;
-}
-
-H1 {
- font-family: "Times New Roman";
- font-size: 14pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: center
-}
-
-H2 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder
-}
-
-H3 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: italic
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
deleted file mode 100644
index dc997eb..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
deleted file mode 100644
index f1a4e44..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6;
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
deleted file mode 100644
index 53c8a1f..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- @charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
deleted file mode 100644
index 5c151d9..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16BOM.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.css
deleted file mode 100644
index f8c05d5..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16be.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.css
deleted file mode 100644
index d8527c1..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16beMalformed.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.css
deleted file mode 100644
index 6c94ffb..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16le.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.css
deleted file mode 100644
index c7dd678..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/utf16leMalformed.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.classpath b/tests/org.eclipse.wst.dtd.core.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.classpath
+++ /dev/null
@@ -1,11 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.cvsignore b/tests/org.eclipse.wst.dtd.core.tests/.cvsignore
deleted file mode 100644
index 59ab8ce..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-dtduitests.jar
-temp.folder
-javaCompiler.dtduitests.jar.args
diff --git a/tests/org.eclipse.wst.dtd.core.tests/.project b/tests/org.eclipse.wst.dtd.core.tests/.project
deleted file mode 100644
index b31364f..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.dtd.core.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.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e6b700e..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Mon Jan 14 17:56:18 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 252c4a3..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.dtd.core.tests;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-ClassPath: dtdcoretests.jar
-Bundle-Activator: org.eclipse.wst.dtd.core.tests.internal.DTDCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.dtd.core.tests,
- org.eclipse.wst.dtd.core.tests.internal;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.core.resources,
- org.eclipse.wst.dtd.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.core,
- org.eclipse.ui,
- org.junit;bundle-version=3.8.2,
- com.ibm.icu,
- org.eclipse.emf.ecore
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.dtd.core.tests/about.html b/tests/org.eclipse.wst.dtd.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/build.properties b/tests/org.eclipse.wst.dtd.core.tests/build.properties
deleted file mode 100644
index d4984f1..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 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
-###############################################################################
-source.dtdcoretests.jar = src/
-output.dtdcoretests.jar = bin/
-bin.includes = dtdcoretests.jar,\
- resources/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.dtd.core.tests/plugin.properties b/tests/org.eclipse.wst.dtd.core.tests/plugin.properties
deleted file mode 100644
index 19e6a6d..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.dtd.ui.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = DTD Core Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd b/tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd
deleted file mode 100644
index 1bb300f..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/resources/dtdParserTest/sample.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- line one -->
-<!-- line two -->
-<!ELEMENT something ANY>
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
deleted file mode 100644
index 73eb490..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDCoreTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.dtd.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class DTDCoreTestSuite extends TestSuite {
- public DTDCoreTestSuite() {
- super("DTD Core TestSuite");
- addTest(new TestSuite(VerifyPlugin.class));
- addTest(new TestSuite(DTDParserTest.class));
- addTestSuite(DTDFileTest.class);
- addTestSuite(DTDModelTests.class);
- }
- public static Test suite() {
- return new DTDCoreTestSuite();
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java
deleted file mode 100644
index be05238..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDFileTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail 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:
- * David Carver (STAR) - bug 245216 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-import junit.framework.TestCase;
-
-public class DTDFileTest extends TestCase {
-
- public DTDFileTest() {
- }
-
- public DTDFileTest(String name) {
- super(name);
- }
-
- public void testGetTopLevelNodeAt() throws Exception {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- DTDModelImpl model = (DTDModelImpl)modelManager.createUnManagedStructuredModelFor(ContentTypeIdForDTD.ContentTypeID_DTD);
- String dtdText = "<!ELEMENT NewElement3 (#PCDATA)><!ENTITY % NewEntity SYSTEM \"\" >";
- IStructuredDocument document = model.getStructuredDocument();
- document.set(dtdText);
-
- model.setStructuredDocument(document);
- DTDFile dtdFile = model.getDTDFile();
-
- DTDNode dtdNode = dtdFile.getTopLevelNodeAt(32);
- assertNotNull("Node is null", dtdNode);
- assertEquals("Unexpected Node Type.", "NewEntity", dtdNode.getName());
- }
-
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java
deleted file mode 100644
index 589e68f..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDModelTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail 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:
- * David Carver (STAR) - bug 245216 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.core.tests;
-
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-import junit.framework.TestCase;
-
-public class DTDModelTests extends TestCase {
-
- public void testcreateUnmanagedDTDModel() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForDTD.ContentTypeID_DTD);
- assertTrue("Did not get DTD Model", model instanceof DTDModelImpl );
- }
-
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java
deleted file mode 100644
index 8a05344..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/DTDParserTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.dtd.core.tests;
-
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.wst.dtd.core.internal.emf.DTDElement;
-import org.eclipse.wst.dtd.core.internal.emf.DTDFile;
-import org.eclipse.wst.dtd.core.internal.emf.util.DTDUtil;
-import org.eclipse.wst.dtd.core.tests.internal.DTDCoreTestsPlugin;
-
-public class DTDParserTest extends TestCase {
-
- private static final String UNEXPECTED_FILE_CONTENTS = "Unexpected file contents";
-
- public void testMultipleCommentParsing() throws IOException {
- DTDUtil util = new DTDUtil();
- String sampleDTDpath = "/resources/dtdParserTest/sample.dtd";
- URL bundleURL = DTDCoreTestsPlugin.getDefault().getBundle().getEntry(sampleDTDpath);
- assertNotNull(sampleDTDpath + " not found in bundle", bundleURL);
- // Do not rely on Common URI Resolver to find the contents
- URL fileURL = FileLocator.toFileURL(bundleURL);
- util.parse(fileURL.toExternalForm());
- DTDFile dtdFile = util.getDTDFile();
- assertEquals(UNEXPECTED_FILE_CONTENTS, 1, dtdFile.getDTDContent().size());
- Object object = dtdFile.getDTDContent().get(0);
- assertTrue(UNEXPECTED_FILE_CONTENTS, object instanceof DTDElement);
- DTDElement dtdElement = (DTDElement) object;
- String comment = dtdElement.getComment();
- assertEquals("Comment value was not as expected", " line one \n line two ", comment);
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java
deleted file mode 100644
index 876bc13..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/VerifyPlugin.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.dtd.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
-
-
-public class VerifyPlugin extends TestCase {
-
- public void testPluginExists() {
- // TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
- assertTrue(true);
- Object plugin = null;
- try {
- plugin = DTDCorePlugin.getPlugin();
- }
- catch (Exception e) {
- plugin = null;
- }
- assertNotNull("DTD core plugin could not be instantiated", plugin);
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java b/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java
deleted file mode 100644
index 0398e3c..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/src/org/eclipse/wst/dtd/core/tests/internal/DTDCoreTestsPlugin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.dtd.core.tests.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-public class DTDCoreTestsPlugin extends Plugin {
-
- private static DTDCoreTestsPlugin plugin;
-
- public static DTDCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- public DTDCoreTestsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- plugin = this;
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-}
diff --git a/tests/org.eclipse.wst.dtd.core.tests/test.xml b/tests/org.eclipse.wst.dtd.core.tests/test.xml
deleted file mode 100644
index f70eb30..0000000
--- a/tests/org.eclipse.wst.dtd.core.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.dtd.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.dtd.core.tests.DTDCoreTestSuite" />
- <!-- Some of the DTD model references UI objects, like Images -->
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.classpath b/tests/org.eclipse.wst.html.tests.encoding/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore b/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
deleted file mode 100644
index 399dfb7..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-htmlencodingtests.jar
-javaCompiler.htmlencodingtests.jar.args
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.project b/tests/org.eclipse.wst.html.tests.encoding/.project
deleted file mode 100644
index 6068b5b..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.html.tests.encoding</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.html.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.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.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.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.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.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.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.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.html.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.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.html.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d31f22..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.tests.encoding
-Bundle-Version: 1.0.500.qualifier
-Bundle-ClassPath: htmlencodingtests.jar
-Bundle-Activator: org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.tests.encoding,
- org.eclipse.wst.html.tests.encoding.html
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.sse.core
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.html.tests.encoding/about.html b/tests/org.eclipse.wst.html.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/build.properties b/tests/org.eclipse.wst.html.tests.encoding/build.properties
deleted file mode 100644
index 5d9a3eb..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-###############################################################################
-source.htmlencodingtests.jar = src/
-output.htmlencodingtests.jar = bin/
-bin.includes = htmlencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties b/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
deleted file mode 100644
index 7714a11..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.html.tests.encoding
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = HTML Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
deleted file mode 100644
index f9458f5..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.tests.encoding.html.HTMLEncodingTests;
-import org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester;
-import org.eclipse.wst.html.tests.encoding.html.TestContentTypeDetectionForHTML;
-
-public class HTMLEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, TestContentTypeDetectionForHTML.class};
-
- public static Test suite() {
- return new HTMLEncodingTestSuite();
- }
-
- public HTMLEncodingTestSuite() {
- super("HTML Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public HTMLEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public HTMLEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public HTMLEncodingTestSuite(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
deleted file mode 100644
index d72162f..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.html.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static HTMLEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static HTMLEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.html.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = HTMLEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public HTMLEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
deleted file mode 100644
index f26283f..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 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.html.tests.encoding.html;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.contenttype.HTMLResourceEncodingDetector;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class HTMLEncodingTests extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
-
- private boolean DEBUG = false;
- private final String fileDir = "html/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- public HTMLEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = HTMLEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((HTMLResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = null;
- if (encodingMemento != null) {
- foundIANAEncoding = encodingMemento.getJavaCharsetName();
- }
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- if (expectedIANAEncoding == null) {
- expectedIANAResult = (expectedIANAEncoding == foundIANAEncoding);
- }
- else {
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
- }
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if
- // throws exception.
- if (expectedIANAEncoding != null) {
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
-
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.html";
- // HTML has no spec default encoding. Will use platform default encoding.
- doTestFileStream(filename, System.getProperty("file.encoding"), new HTMLResourceEncodingDetector());
- }
-
- public void testIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.html";
- String ianaInFile = "UTF-8";
- doTestFileStream(filename, ianaInFile, new HTMLResourceEncodingDetector());
- }
-
- public void testMultiNonDefault() throws IOException {
- String filename = fileLocation + "MultiNonDefault.html";
- doTestFileStream(filename, "ISO-8859-6", new HTMLResourceEncodingDetector());
- }
-
- public void testNoEncoding() throws IOException {
- String filename = fileLocation + "NoEncoding.html";
- // HTML has no spec default encoding. Will use platform default encoding.
- doTestFileStream(filename, System.getProperty("file.encoding"), new HTMLResourceEncodingDetector());
- }
-
- public void testnoquotes() throws IOException {
- String filename = fileLocation + "noquotes.html";
- doTestFileStream(filename, "UTF-8", new HTMLResourceEncodingDetector());
-
- }
-
- public void testNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.html";
- String ianaInFile = "UTF-8";
- doTestFileStream(filename, ianaInFile, new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16BE() throws IOException {
- String filename = fileLocation + "utf16be.html";
- doTestFileStream(filename, "UTF-16BE", new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16LE() throws IOException {
- String filename = fileLocation + "utf16le.html";
- doTestFileStream(filename, "UTF-16LE", new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16LENoQuotes() throws IOException {
- String filename = fileLocation + "noquotesUTF16le.html";
- doTestFileStream(filename, "UTF-16LE", new HTMLResourceEncodingDetector());
- }
-
- public void testUTF16BOM() throws IOException {
- String filename = this.fileLocation + "utf16BOM.html";
- doTestFileStream(filename, "UTF-16", new HTMLResourceEncodingDetector());
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
deleted file mode 100644
index 2222ee6..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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.html.tests.encoding.html;
-
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer;
-import org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizerConstants;
-import org.eclipse.wst.html.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.tests.encoding.ZippedTest;
-
-public class HTMLHeadTokenizerTester extends TestCase {
- boolean DEBUG = false;
- private String fCharset;
-
- private String fContentTypeValue;
- private final String fileDir = "html/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = this.fileHome + this.fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
-
- private void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType) {
- try {
- doTestFile(HTMLEncodingTestsPlugin.getTestReader(filename), expectedName, finalTokenType);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename +"\"");
- }
- }
-
- private void doTestFile(Reader fileReader, String expectedName, String finalTokenType) throws IOException {
- HTMLHeadTokenizer tokenizer = null;
- tokenizer = new HTMLHeadTokenizer(fileReader);
-
- HeadParserToken resultToken = null;
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
- else {
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
- }
- else {
- // TODO: need to work on case issues
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue.toUpperCase()));
- }
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testNormalNonDefault() {
- // String filename = fileLocation + "NormalNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (this.fXMLDecEncodingName != null) {
- result = this.fXMLDecEncodingName;
- }
- else if (this.fPageEncodingValue != null) {
- result = this.fPageEncodingValue;
- }
- else if (this.fCharset != null) {
- result = this.fCharset;
- }
- return result;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType == null) {
- result = false;
- }
- else {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- private void parseContentTypeValue(String contentType) {
- Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*");
- String[] parts = pattern.split(contentType);
- if (parts.length > 0) {
- // if only one item, it can still be charset instead of
- // contentType
- if (parts.length == 1) {
- if (parts[0].length() > 6) {
- String checkForCharset = parts[0].substring(0, 7);
- if (checkForCharset.equalsIgnoreCase("charset")) {
- int eqpos = parts[0].indexOf('=');
- eqpos = eqpos + 1;
- if (eqpos < parts[0].length()) {
- this.fCharset = parts[0].substring(eqpos);
- this.fCharset = this.fCharset.trim();
- }
- }
- }
- }
- else {
- // fContentType = parts[0];
- }
-
- }
- if (parts.length > 1) {
- this.fCharset = parts[1];
- }
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(HTMLHeadTokenizer tokenizer) throws IOException {
- this.fPageEncodingValue = null;
- this.fCharset = null;
- /*
- * if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) { if
- * (tokenizer.hasMoreTokens()) { ITextHeadRegion valueToken =
- * tokenizer.getNextToken(); String valueTokenType =
- * valueToken.getType(); if (isLegal(valueTokenType)) { resultValue =
- * valueToken.getText(); if (DEBUG) { System.out.println("XML Head
- * Tokenizer Found Encoding: " + resultValue); } } } }
- */
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- if (this.DEBUG) {
- System.out.println(token);
- }
- String tokenType = token.getType();
- if(canHandleAsUnicodeStream(tokenType)) {
-
- }
- if (tokenType == HTMLHeadTokenizerConstants.MetaTagContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- if (this.DEBUG) {
- System.out.println(valueToken);
- }
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- this.fContentTypeValue = valueToken.getText();
-
- }
- }
- }
-
- }
- while (tokenizer.hasMoreTokens());
- if (this.fContentTypeValue != null) {
- parseContentTypeValue(this.fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
-
- }
-
- private boolean canHandleAsUnicodeStream(String tokenType) {
- boolean canHandleAsUnicode = false;
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-8"; //$NON-NLS-1$
- }
- else if (tokenType == EncodingParserConstants.UTF16BE || tokenType == EncodingParserConstants.UTF16LE) {
- canHandleAsUnicode = true;
- this.fCharset = "UTF-16"; //$NON-NLS-1$
- }
- return canHandleAsUnicode;
- }
-
- public void testBestCase() throws IOException {
- String filename = this.fileLocation + "NormalNonDefault.html";
- doTestFile(filename, "UTF-8");
-
- }
-
- // public void testIllFormed() {
- // String filename = fileLocation + "testIllFormed.jsp";
- // doTestFile(filename);
- // }
- // public void testIllFormed2() {
- // String filename = fileLocation + "testIllFormed2.jsp";
- // doTestFile(filename);
- // }
- // public void testIllformedNormalNonDefault() {
- // String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- // doTestFile(filename);
- // }
- public void testEmptyFile() throws IOException {
- String filename = this.fileLocation + "EmptyFile.html";
- doTestFile(filename, null);
- }
-
- public void testIllFormedNormalNonDefault() throws IOException {
- String filename = this.fileLocation + "IllformedNormalNonDefault.html";
- doTestFile(filename, "UTF-8");
- }
-
- public void testLargeCase() throws IOException {
- String filename = this.fileLocation + "LargeNonDefault.html";
- doTestFile(filename, "ISO-8859-1");
-
- }
-
- public void testLargeNoEncoding() throws IOException {
- String filename = this.fileLocation + "LargeNoEncoding.html";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
-
- }
-
- public void testMultiNonDefault() throws IOException {
- String filename = this.fileLocation + "MultiNonDefault.html";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testNoEncoding() throws IOException {
- String filename = this.fileLocation + "NoEncoding.html";
- doTestFile(filename, null);
- }
-
- public void testnoquotes() throws IOException {
- String filename = this.fileLocation + "noquotes.html";
- doTestFile(filename, "UTF-8");
-
- }
-
- public void testnoquotesUTF16le() throws IOException {
- String filename = this.fileLocation + "noquotesUTF16le.html";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16le() throws IOException {
- String filename = this.fileLocation + "utf16le.html";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16be() throws IOException {
- String filename = this.fileLocation + "utf16be.html";
- doTestFile(filename, "UTF-16BE");
- }
-
- /*
- sun.io.MalformedInputException
- at sun.io.ByteToCharUTF8.convert(ByteToCharUTF8.java:262)
- at sun.nio.cs.StreamDecoder$ConverterSD.convertInto(StreamDecoder.java:314)
- at sun.nio.cs.StreamDecoder$ConverterSD.implRead(StreamDecoder.java:364)
- at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:250)
- at java.io.InputStreamReader.read(InputStreamReader.java:212)
- at org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer.yy_advance(HTMLHeadTokenizer.java:340)
- at org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer.primGetNextToken(HTMLHeadTokenizer.java:477)
- at org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer.getNextToken(HTMLHeadTokenizer.java:232)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.parseHeader(HTMLHeadTokenizerTester.java:175)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.doTestFile(HTMLHeadTokenizerTester.java:57)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.doTestFile(HTMLHeadTokenizerTester.java:37)
- at org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester.testUTF16BOM(HTMLHeadTokenizerTester.java:293)
- */
-
- public void testUTF16BOM() throws Exception {
- String filename = this.fileLocation + "utf16BOM.html";
- ZippedTest test = new ZippedTest();
- test.setUp();
- IFile file = test.getFile(filename);
- assertNotNull(file);
- Reader fileReader = new FileReader(file.getLocationURI().getPath());
- doTestFile(fileReader, "UTF-16", null);
- test.shutDown();
- }
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java
deleted file mode 100644
index dc7ea24..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 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.html.tests.encoding.html;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForHTML extends TestContentTypeDetection {
- public void testFile57() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/EmptyFile.html", null);
- }
-
- public void testFile58() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/IllformedNormalNonDefault.html", null);
- }
-
- public void testFile59() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/LargeNoEncoding.html", null);
- }
-
-
- public void testFile60() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/LargeNonDefault.html", null);
- }
-
- public void testFile61() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/MultiNonDefault.html", null);
- }
-
- public void testFile62() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/NoEncoding.html", null);
- }
-
- public void testFile63() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/noquotes.html", null);
- }
-
- public void testFile64() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/NormalNonDefault.html", null);
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/utf16be.html", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/utf16le.html", null);
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/noquotesUTF16le.html", null);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/utf16BOM.html", null);
- }
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/test.xml b/tests/org.eclipse.wst.html.tests.encoding/test.xml
deleted file mode 100644
index fbbf772..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.html.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
deleted file mode 100644
index ef8b5c8..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
deleted file mode 100644
index 84ca60e..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,664 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
deleted file mode 100644
index 3bcdd14..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,665 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html
deleted file mode 100644
index f772113..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html
deleted file mode 100644
index 070e4fe..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html
deleted file mode 100644
index ba30c9f..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html
deleted file mode 100644
index 254cde4..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content=text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.html
deleted file mode 100644
index acbd519..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotesUTF16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
deleted file mode 100644
index 71915f4..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16BOM.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.html
deleted file mode 100644
index 0afe69b..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16be.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.html
deleted file mode 100644
index f4efb61..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/utf16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.classpath b/tests/org.eclipse.wst.xml.catalog.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.xml.catalog.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.catalog.tests/.cvsignore b/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.project b/tests/org.eclipse.wst.xml.catalog.tests/.project
deleted file mode 100644
index c417514..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.core</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.catalog.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6c7d10e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Mar 25 17:34:01 EST 2005
-eclipse.preferences.version=1
-encoding//data/PublicationCatalogue/Catalogue.xsd=UTF8
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 686b185..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.catalog.tests; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.wst.xml.catalog.tests.internal.TestPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.catalog.tests.internal
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.wst.xml.core,
- org.apache.xerces,
- org.eclipse.xsd,
- org.eclipse.wst.common.uriresolver
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: catalogtests.jar
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/about.html b/tests/org.eclipse.wst.xml.catalog.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/build.properties b/tests/org.eclipse.wst.xml.catalog.tests/build.properties
deleted file mode 100644
index 39ddc13..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.catalogtests.jar = src/
-output.catalogtests.jar = bin/
-bin.includes = data/,\
- plugin.xml,\
- test.xml,\
- META-INF/,\
- catalogtests.jar,\
- about.html,\
- plugin.properties
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/catalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/catalog1.xml
deleted file mode 100644
index 57a1ba7..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/catalog1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="InvoiceId_test" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd" webURL="http://webURL"/>
- <system chached="yes" property="value1" systemId="Invoice.dtd" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd"/>
- <uri chached="no" name="http://www.test.com/Invoice.dtd" property="value2" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd"/>
- <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml b/tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml
deleted file mode 100644
index b9ea12a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/catalog11-x.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public id="idvalue1" publicId="Kroelleboelle" uri="http://tempuri.org"/>
- <system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- <uri name="urn:fishy:fish" uri="http://www.example.org/"/>
- <public id="idvalue2" publicId="Sleepy" uri="http://tempuri.org"/>
- <system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- <nextCatalog catalog="catalog.xml"/>
- <delegatePublic catalog="tom.xml" publicIdStartString="-//OASIS//"/>
- <delegateSystem catalog="fritz.xml" systemIdStartString="http:"/>
- <delegateURI catalog="garfield.xml" uriStartString="urn:x-foods:lasagna"/>
- <systemSuffix systemIdSuffix="schemas/goof.xml" uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/schemas/2009/goof-v2.xml"/>
- <uriSuffix uri="file:///Users/jesper/Documents/workspace-helios/org.eclipse.wst.xml.catalog.tests/data/schemas/2009/fun-v2.xml" uriSuffix="schemas/goof.xml"/>
- <rewriteSystem rewritePrefix="http://cache.some-repository.com/schemes/" systemIdStartString="http://www.original-repository.com/schemes/"/>
- <rewriteURI rewritePrefix="urn:funny:" uriStartString="urn:x-funny:"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd b/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd
deleted file mode 100644
index 0737ba6..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/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.catalog.tests/data/Invoice/Invoice.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml
deleted file mode 100644
index 6afe397..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId_test" "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.catalog.tests/data/Personal/personal-schema.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml
deleted file mode 100644
index c2f725b..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<personnel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation='personal.xsd'>
-
- <person id="Big.Boss" >
- <name><family>Boss</family> <given>Big</given></name>
- <email>chief@foo.com</email>
- <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
- </person>
-
- <person id="one.worker">
- <name><family>Worker</family> <given>One</given></name>
- <email>one@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="two.worker">
- <name><family>Worker</family> <given>Two</given></name>
- <email>two@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="three.worker">
- <name><family>Worker</family> <given>Three</given></name>
- <email>three@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="four.worker">
- <name><family>Worker</family> <given>Four</given></name>
- <email>four@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="five.worker">
- <name><family>Worker</family> <given>Five</given></name>
- <email>five@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
-</personnel>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd
deleted file mode 100644
index c64e48a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml encoding="UTF-8"?>
-<!ELEMENT personnel (person)+>
-
-<!ELEMENT person (name,email*,url*,link?)>
-<!ATTLIST person id ID #REQUIRED>
-<!ATTLIST person note CDATA #IMPLIED>
-<!ATTLIST person contr (true|false) 'false'>
-<!ATTLIST person salary CDATA #IMPLIED>
-
-<!ELEMENT name ((family,given)|(given,family))>
-
-<!ELEMENT family (#PCDATA)>
-
-<!ELEMENT given (#PCDATA)>
-
-<!ELEMENT email (#PCDATA)>
-
-<!ELEMENT url EMPTY>
-<!ATTLIST url href CDATA 'http://'>
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link manager IDREF #IMPLIED>
-<!ATTLIST link subordinates IDREFS #IMPLIED>
-
-<!NOTATION gif PUBLIC '-//APP/Photoshop/4.0' 'photoshop.exe'>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml
deleted file mode 100644
index 9c3e438..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE personnel SYSTEM "http://personal/personal.dtd">
-<personnel>
-
- <person id="Big.Boss">
- <name><family>Boss</family> <given>Big</given></name>
- <email>chief@foo.com</email>
- <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
- </person>
-
- <person id="one.worker">
- <name><family>Worker</family> <given>One</given></name>
- <email>one@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="two.worker">
- <name><family>Worker</family> <given>Two</given></name>
- <email>two@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="three.worker">
- <name><family>Worker</family> <given>Three</given></name>
- <email>three@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="four.worker">
- <name><family>Worker</family> <given>Four</given></name>
- <email>four@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
- <person id="five.worker">
- <name><family>Worker</family> <given>Five</given></name>
- <email>five@foo.com</email>
- <link manager="Big.Boss"/>
- </person>
-
-</personnel>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd
deleted file mode 100644
index 05e3183..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
-
- <xs:element name="personnel">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="person" minOccurs='1' maxOccurs='unbounded'/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:unique name="unique1">
- <xs:selector xpath="person"/>
- <xs:field xpath="name/given"/>
- <xs:field xpath="name/family"/>
- </xs:unique>
- <xs:key name='empid'>
- <xs:selector xpath="person"/>
- <xs:field xpath="@id"/>
- </xs:key>
- <xs:keyref name="keyref1" refer='empid'>
- <xs:selector xpath="person"/>
- <xs:field xpath="link/@manager"/>
- </xs:keyref>
-
- </xs:element>
-
- <xs:element name="person">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="name"/>
- <xs:element ref="email" minOccurs='0' maxOccurs='unbounded'/>
- <xs:element ref="url" minOccurs='0' maxOccurs='unbounded'/>
- <xs:element ref="link" minOccurs='1' maxOccurs='1'/>
- </xs:sequence>
- <xs:attribute name="id" type="xs:ID" use='required'/>
- <xs:attribute name="note" type="xs:string"/>
- <xs:attribute name="contr" default="false">
- <xs:simpleType>
- <xs:restriction base = "xs:string">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="salary" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="name">
- <xs:complexType>
- <xs:all>
- <xs:element ref="family"/>
- <xs:element ref="given"/>
- </xs:all>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="family" type='xs:string'/>
-
- <xs:element name="given" type='xs:string'/>
-
- <xs:element name="email" type='xs:string'/>
-
- <xs:element name="url">
- <xs:complexType>
- <xs:attribute name="href" type="xs:string" default="http://"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="link">
- <xs:complexType>
- <xs:attribute name="manager" type="xs:IDREF"/>
- <xs:attribute name="subordinates" type="xs:IDREFS"/>
- </xs:complexType>
- </xs:element>
-
- <xs:notation name='gif' public='-//APP/Photoshop/4.0' system='photoshop.exe'/>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml
deleted file mode 100644
index e66621d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/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/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue/test 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.catalog.tests/data/PublicationCatalogue/Catalogue.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd
deleted file mode 100644
index 1668642..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.eclipse.org/webtools/Catalogue/test"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:c="http://www.eclipse.org/webtools/Catalogue/test"
- xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue/test Catalogue.xsd ">
- <group name="test">
- <sequence>
- <element name="test1"></element>
- </sequence>
- </group>
- <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.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml
deleted file mode 100644
index 12bd7e6..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<po:purchaseOrder orderDate="2001-01-01" xmlns:po="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com PurchaseOrder.xsd">
- <shipTo country="US">
- <name>Alice Smith</name>
- <street>125 Maple Street</street>
- <city>Mill Valley</city>
- <state>CA</state>
- <zip>90952</zip>
- </shipTo>
- <billTo country="US">
- <name>Robert Smith</name>
- <street>8 Oak Avenue</street>
- <city>Old Town</city>
- <state>PA</state>
- <zip>95819</zip>
- </billTo>
- <po:comment>Hurry, my lawn is going wild!</po:comment>
- <items>
- <item partNum="872-AA">
- <productName>Lawnmower</productName>
- <quantity>1</quantity>
- <USPrice>148.95</USPrice>
- <po:comment>Confirm this is electric</po:comment>
- </item>
- <item partNum="926-AA">
- <productName>Baby Monitor</productName>
- <quantity>1</quantity>
- <USPrice>39.98</USPrice>
- <shipDate>2001-07-21</shipDate>
- </item>
- </items>
-</po:purchaseOrder>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd
deleted file mode 100644
index d0fb094..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.ibm.com"
- xmlns:po="http://www.ibm.com">
- <annotation>
- <documentation xml:lang="en">
- Purchase order schema example from XML Schema Part 0: Primer
-
- Copyright 2001, IBM Corp. All rights reserved
- Copyright 2001, World Wide Web Consortium,
- (Massachusetts Institute of Technology, Institut National de Recherche en Informatiqueet en Automatique, Keio University).
- All Rights Reserved.
- </documentation>
- </annotation>
-
- <element name="purchaseOrder" type="po:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
- <sequence>
- <element name="shipTo" type="po:USAddress"/>
- <element name="billTo" type="po:USAddress"/>
- <element ref="po:comment" minOccurs="0"/>
- <element name="items" type="po:Items"/>
- </sequence>
- <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="USAddress">
- <sequence>
- <element name="name" type="string"/>
- <element name="street" type="string"/>
- <element name="city" type="string"/>
- <element name="state" type="po:USState"/>
- <element name="zip" type="decimal"/>
- </sequence>
- <attribute name="country" type="NMTOKEN" fixed="US"/>
- </complexType>
-
- <complexType name="Items">
- <sequence>
- <element name="item" minOccurs="0" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="productName" type="string"/>
- <element name="quantity">
- <simpleType>
- <restriction base="positiveInteger">
- <maxExclusive value="100"/>
- </restriction>
- </simpleType>
- </element>
- <element name="USPrice" type="decimal"/>
- <element ref="po:comment" minOccurs="0"/>
- <element name="shipDate" type="date" minOccurs="0"/>
- </sequence>
- <attribute name="partNum" type="po:SKU" use="required"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <simpleType name="SKU">
- <restriction base="string">
- <pattern value="\d{3}-[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
- <simpleType name="USState">
- <restriction base="string">
- <enumeration value="CA"></enumeration>
- <enumeration value="PA"></enumeration>
- <enumeration value="AR"></enumeration>
- </restriction>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd
deleted file mode 100644
index 26ea442..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd
+++ /dev/null
@@ -1,68 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
- <documentation xml:lang="en">
- Addresses for International Purchase order schema
- Copyright 2000 Example.com. All rights reserved.
- </documentation>
- </annotation>
-
- <complexType name="Address">
- <sequence>
- <element name="name" type="string"/>
- <element name="street" type="string"/>
- <element name="city" type="string"/>
- </sequence>
- </complexType>
-
- <complexType name="USAddress">
- <complexContent>
- <extension base="ipo:Address">
- <sequence>
- <element name="state" type="ipo:USState"/>
- <element name="zip" type="positiveInteger"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="UKAddress">
- <complexContent>
- <extension base="ipo:Address">
- <sequence>
- <element name="postcode" type="ipo:UKPostcode"/>
- </sequence>
- <attribute name="exportCode" type="positiveInteger" fixed="1"/>
- </extension>
- </complexContent>
- </complexType>
-
- <!-- other Address derivations for more countries -->
-
- <simpleType name="USState">
- <restriction base="string">
- <enumeration value="AK"/>
- <enumeration value="AL"/>
- <enumeration value="AR"/>
- <!-- and so on ... -->
- </restriction>
- </simpleType>
-
- <!-- simple type definition for Postcode -->
- <simpleType name="Postcode">
- <restriction base="string">
- </restriction>
- </simpleType>
-
- <!-- simple type definition for UKPostcode -->
- <simpleType name="UKPostcode">
- <restriction base="ipo:Postcode">
- <pattern value="[A-Z]{2}\d\s\d[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
-
-</schema>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml
deleted file mode 100644
index d483ade..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<ipo:purchaseOrder
- orderDate="2001-01-01" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ipo="http://www.example.com/IPO" xsi:schemaLocation="http://www.example.com/IPO ipo.xsd ">
-
- <shipTo exportCode="1" xsi:type="ipo:UKAddress">
- <name>Helen Zoe</name>
- <street>47 Eden Street</street>
- <city>Cambridge</city>
- <postcode>CB1 1JR</postcode>
- </shipTo>
-
- <billTo xsi:type="ipo:USAddress">
- <name>Robert Smith</name>
- <street>8 Oak Avenue</street>
- <city>Old Town</city>
- <state>AR</state>
- <zip>95819</zip>
- </billTo>
-
- <items>
- <item partNum="833-AA">
- <productName>Lapis necklace</productName>
- <quantity>1</quantity>
- <USPrice>99.95</USPrice>
- <ipo:comment>Want this for the holidays!</ipo:comment>
- <shipDate>1999-12-05</shipDate>
- </item>
- </items>
-</ipo:purchaseOrder>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd
deleted file mode 100644
index 7a63d01..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
- <documentation xml:lang="en">
- International Purchase order schema for Example.com
- Copyright 2000 Example.com. All rights reserved.
- </documentation>
- </annotation>
-
- <!-- include address constructs -->
- <include
- schemaLocation="address.xsd"/>
-
- <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
- <sequence>
- <element name="shipTo" type="ipo:Address"/>
- <element name="billTo" type="ipo:Address"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="items" type="ipo:Items"/>
- </sequence>
- <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="Items">
- <sequence>
- <element name="item" minOccurs="0" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="productName" type="string"/>
- <element name="quantity">
- <simpleType>
- <restriction base="positiveInteger">
- <maxExclusive value="100"/>
- </restriction>
- </simpleType>
- </element>
- <element name="USPrice" type="decimal"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="shipDate" type="date" minOccurs="0"/>
- </sequence>
- <attribute name="partNum" type="ipo:SKU" use="required"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <simpleType name="SKU">
- <restriction base="string">
- <pattern value="\d{3}-[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd
deleted file mode 100644
index 436d49d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
- <documentation xml:lang="en">
- International Purchase order schema for Example.com
- Copyright 2000 Example.com. All rights reserved.
- </documentation>
- </annotation>
-
- <!-- include address constructs -->
- <include
- schemaLocation="address_.xsd"/>
-
- <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
- <sequence>
- <element name="shipTo" type="ipo:Address"/>
- <element name="billTo" type="ipo:Address"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="items" type="ipo:Items"/>
- </sequence>
- <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="Items">
- <sequence>
- <element name="item" minOccurs="0" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="productName" type="string"/>
- <element name="quantity">
- <simpleType>
- <restriction base="positiveInteger">
- <maxExclusive value="100"/>
- </restriction>
- </simpleType>
- </element>
- <element name="USPrice" type="decimal"/>
- <element ref="ipo:comment" minOccurs="0"/>
- <element name="shipDate" type="date" minOccurs="0"/>
- </sequence>
- <attribute name="partNum" type="ipo:SKU" use="required"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <simpleType name="SKU">
- <restriction base="string">
- <pattern value="\d{3}-[A-Z]{2}"/>
- </restriction>
- </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml
deleted file mode 100644
index 98ed6f1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ex:purchaseReport
- xmlns:ex="http://www.example.com/Report"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.example.com/Report report.xsd">
- <ex:regions>
- <ex:zip code="39487">
- <ex:part number="293-AX" quantity="3"/>
- <ex:part number="293-LD" quantity="3"/>
- </ex:zip>
- <ex:zip code="29387">
- <ex:part number="897-JD" quantity="30"/>
- </ex:zip>
- <ex:zip code="19285">
- <ex:part number="123-CK" quantity="19"/>
- <ex:part number="175-FQ" quantity="8"/>
- </ex:zip>
- </ex:regions>
-
- <ex:parts>
- <ex:part number="293-AX"/>
- <ex:part number="897-JD"/>
- <ex:part number="123-CK"/>
- <ex:part number="293-LD"/>
- <ex:part number="175-FQ"/>
- </ex:parts>
-</ex:purchaseReport>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd
deleted file mode 100644
index 0ee7ca4..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com/Report"
- xmlns:r="http://www.example.com/Report"
- xmlns:xipo="http://www.example.com/IPO"
- elementFormDefault="qualified">
- <annotation>
- <documentation>
- The Report Schema from XML Schema Part 0: Primer
-
- Copyright 2001, IBM Corp. All Rights Reserved.
- Copyright 2001, World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
- </documentation>
- </annotation>
-
- <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd"/>
-
- <element name="purchaseReport">
- <complexType>
- <sequence>
- <element name="regions" type="r:RegionsType"/>
-
- <element name="parts" type="r:PartsType"/>
- </sequence>
- <attribute name="period" type="duration"/>
- <attribute name="periodEnding" type="date"/>
- </complexType>
-
- <unique name="dummy1">
- <selector xpath="r:regions/r:zip"/>
- <field xpath="@code"/>
- </unique>
-
- <key name="pNumKey">
- <selector xpath="r:parts/r:part"/>
- <field xpath="@number"/>
- </key>
- <keyref name="dummy2" refer="r:pNumKey">
- <selector xpath="r:regions/r:zip/r:part"/>
- <field xpath="@number"/>
- </keyref>
- </element>
-
- <complexType name="RegionsType">
- <sequence>
- <element name="zip" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <complexContent>
- <restriction base="anyType">
- <attribute name="number" type="xipo:SKU"/>
- <attribute name="quantity" type="positiveInteger"/>
- </restriction>
- </complexContent>
- </complexType>
- </element>
- </sequence>
- <attribute name="code" type="positiveInteger"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <complexType name="PartsType">
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <simpleContent>
- <extension base="string">
- <attribute name="number" type="xipo:SKU"/>
- </extension>
- </simpleContent>
- </complexType>
- </element>
- </sequence>
- </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml
deleted file mode 100644
index 7d34ce1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ex:purchaseReport
- xmlns:ex="http://www.example.com/Report"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.example.com/Report">
- <ex:regions>
- <ex:zip code="39487">
- <ex:part number="293-AX" quantity="3"/>
- <ex:part number="293-LD" quantity="3"/>
- </ex:zip>
- <ex:zip code="29387">
- <ex:part number="897-JD" quantity="30"/>
- </ex:zip>
- <ex:zip code="19285">
- <ex:part number="123-CK" quantity="19"/>
- <ex:part number="175-FQ" quantity="8"/>
- </ex:zip>
- </ex:regions>
-
- <ex:parts>
- <ex:part number="293-AX"/>
- <ex:part number="897-JD"/>
- <ex:part number="123-CK"/>
- <ex:part number="293-LD"/>
- <ex:part number="175-FQ"/>
- </ex:parts>
-</ex:purchaseReport>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd
deleted file mode 100644
index cb284be..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com/Report"
- xmlns:r="http://www.example.com/Report"
- xmlns:xipo="http://www.example.com/IPO"
- elementFormDefault="qualified">
- <annotation>
- <documentation>
- The Report Schema from XML Schema Part 0: Primer
-
- Copyright 2001, IBM Corp. All Rights Reserved.
- Copyright 2001, World Wide Web Consortium
- (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
- All Rights Reserved.
- </documentation>
- </annotation>
-
- <import namespace="http://www.example.com/IPO" schemaLocation="ipo__.xsd"/>
-
- <element name="purchaseReport">
- <complexType>
- <sequence>
- <element name="regions" type="r:RegionsType"/>
-
- <element name="parts" type="r:PartsType"/>
- </sequence>
- <attribute name="period" type="duration"/>
- <attribute name="periodEnding" type="date"/>
- </complexType>
-
- <unique name="dummy1">
- <selector xpath="r:regions/r:zip"/>
- <field xpath="@code"/>
- </unique>
-
- <key name="pNumKey">
- <selector xpath="r:parts/r:part"/>
- <field xpath="@number"/>
- </key>
- <keyref name="dummy2" refer="r:pNumKey">
- <selector xpath="r:regions/r:zip/r:part"/>
- <field xpath="@number"/>
- </keyref>
- </element>
-
- <complexType name="RegionsType">
- <sequence>
- <element name="zip" maxOccurs="unbounded">
- <complexType>
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <complexContent>
- <restriction base="anyType">
- <attribute name="number" type="xipo:SKU"/>
- <attribute name="quantity" type="positiveInteger"/>
- </restriction>
- </complexContent>
- </complexType>
- </element>
- </sequence>
- <attribute name="code" type="positiveInteger"/>
- </complexType>
- </element>
- </sequence>
- </complexType>
-
- <complexType name="PartsType">
- <sequence>
- <element name="part" maxOccurs="unbounded">
- <complexType>
- <simpleContent>
- <extension base="string">
- <attribute name="number" type="xipo:SKU"/>
- </extension>
- </simpleContent>
- </complexType>
- </element>
- </sequence>
- </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd
deleted file mode 100644
index b00c82c..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:er="http://oasis.names.tc.entity.xmlns.xml.catalog"
- targetNamespace="http://oasis.names.tc.entity.xmlns.xml.catalog"
- elementFormDefault="qualified">
-
- <!-- $Id: catalog.xsd,v 1.1 2005/06/24 04:17:50 csalter Exp $ -->
-
- <xs:simpleType name="pubIdChars">
- <!-- A string of the characters defined as pubIdChar in production 13
- of the Second Edition of the XML 1.0 Recommendation. Does not include
- the whitespace characters because they're normalized by XML parsing. -->
- <xs:restriction base="xs:string">
- <xs:pattern value="[a\-zA\-Z0\-9\-'()+,./:=?;!*#@$_%]*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name='publicIdentifier'>
- <xs:restriction base="er:pubIdChars"/>
- </xs:simpleType>
-
- <xs:simpleType name='partialPublicIdentifier'>
- <xs:restriction base='er:pubIdChars'/>
- </xs:simpleType>
-
- <xs:simpleType name='systemOrPublic'>
- <xs:restriction base='xs:string'>
- <xs:enumeration value='system'/>
- <xs:enumeration value='public'/>
- </xs:restriction>
- </xs:simpleType>
-
- <!-- The global attribute xml:base is not explicitly declared; -->
- <!-- it is allowed by the anyAttribute declarations. -->
-
- <xs:complexType name='catalog'>
- <xs:choice minOccurs='1' maxOccurs='unbounded'>
- <xs:element ref='er:public'/>
- <xs:element ref='er:system'/>
- <xs:element ref='er:uri'/>
- <xs:element ref='er:rewriteSystem'/>
- <xs:element ref='er:rewriteURI'/>
- <xs:element ref='er:delegatePublic'/>
- <xs:element ref='er:delegateSystem'/>
- <xs:element ref='er:delegateURI'/>
- <xs:element ref='er:nextCatalog'/>
- <xs:element ref='er:group'/>
- <xs:any namespace='##other' processContents='skip'/>
- </xs:choice>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:attribute name='prefer' type='er:systemOrPublic'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:complexType name='public'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="publicId" type="er:publicIdentifier"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='system'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemId" type="xs:string"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='uri'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="name" type="xs:anyURI"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='rewriteSystem'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='rewriteURI'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='delegatePublic'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="publicIdStartString"
- type="er:partialPublicIdentifier"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='delegateSystem'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='delegateURI'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='nextCatalog'>
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name='group'>
- <xs:choice minOccurs='1' maxOccurs='unbounded'>
- <xs:element ref='er:public'/>
- <xs:element ref='er:system'/>
- <xs:element ref='er:uri'/>
- <xs:element ref='er:rewriteSystem'/>
- <xs:element ref='er:rewriteURI'/>
- <xs:element ref='er:delegatePublic'/>
- <xs:element ref='er:delegateSystem'/>
- <xs:element ref='er:delegateURI'/>
- <xs:element ref='er:nextCatalog'/>
- <xs:any namespace='##other' processContents='skip'/>
- </xs:choice>
- <xs:attribute name='prefer' type='er:systemOrPublic'/>
- <xs:attribute name='id' type='xs:ID'/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="catalog" type="er:catalog"/>
- <xs:element name="public" type="er:public"/>
- <xs:element name="system" type="er:system"/>
- <xs:element name="uri" type="er:uri"/>
- <xs:element name="rewriteSystem" type="er:rewriteSystem"/>
- <xs:element name="rewriteURI" type="er:rewriteURI"/>
- <xs:element name="delegatePublic" type="er:delegatePublic"/>
- <xs:element name="delegateSystem" type="er:delegateSystem"/>
- <xs:element name="delegateURI" type="er:delegateURI"/>
- <xs:element name="nextCatalog" type="er:nextCatalog"/>
- <xs:element name="group" type="er:group"/>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml
deleted file mode 100644
index 124bc14..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="InvoiceId_test" uri="./Invoice/Invoice.dtd" webURL="http://webURL"/>
- <system systemId="Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="yes" property="value1"/>
- <uri name="http://www.test.com/Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="no" property="value2"/>
- <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml
deleted file mode 100644
index 8839591..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="http://www.eclipse.org/webtools/Catalogue_001" uri="./PublicationCatalogue/Catalogue.xsd" />
- <system systemId="Catalogue.xsd" uri="./PublicationCatalogue/Catalogue.xsd" />
- <uri name="http://www.eclipse.org/webtools/Catalogue.xsd" uri="http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd" />
- <group id="group1" prefer="system">
- <public publicId="http://www.eclipse.org/webtools/Catalogue_002" uri="./PublicationCatalogue/Catalogue.xsd" />
- </group>
- </catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml
deleted file mode 100644
index 2866132..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="http://www.eclipse.org/webtools/Catalogue" uri="./PublicationCatalogue/Catalogue.xsd"/>
- <system systemId="Catalogue.xsd" uri="./PublicationCatalogue/Catalogue.xsd"/>
- <group id="group1" prefer="system">
- <uri name="http://Catalogue.xsd" uri="http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd"/>
- </group>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog b/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog
deleted file mode 100644
index a884551..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<XMLCatalogSettings>
- <UserEntries>
- <UserEntry TYPE="PUBLIC" ID="InvoiceId"
-URI="platform:/resource/XMLExamples/Invoice2/Invoice.dtd"/>
- </UserEntries>
-</XMLCatalogSettings>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml
deleted file mode 100644
index 7c794c5..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
- <rewriteSystem systemIdStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" rewritePrefix="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
- <rewriteURI uriStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" rewritePrefix="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog11.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog11.xml
deleted file mode 100644
index d1cbbd8..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog11.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cat:catalog
- prefer="system"
- xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- xmlns:custom="urn:x-test:schema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:oasis:names:tc:entity:xmlns:xml:catalog ../xsd/xmlcatalog11.xsd ">
-
- <!-- The original ones -->
- <cat:public id="idvalue0" publicId="" uri="http://tempuri.org"/>
- <cat:public id="idvalue1" publicId="Kroelleboelle" uri="http://tempuri.org"/>
- <cat:system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- <cat:uri name="urn:fishy:fish" uri="http://www.example.org/"/>
- <cat:nextCatalog catalog="catalog.xml" custom:custom1="yes"/>
-
- <!-- The "newer" ones (partial support from WTP 3.1) -->
- <cat:delegatePublic catalog="tom.xml" publicIdStartString="-//OASIS//"/>
- <cat:delegateSystem catalog="fritz.xml" systemIdStartString="http:"/>
- <cat:delegateURI catalog="garfield.xml" uriStartString="urn:x-foods:lasagna"/>
-
- <cat:rewriteSystem
- systemIdStartString="http://www.original-repository.com/schemes/"
- rewritePrefix="http://cache.some-repository.com/schemes/" />
- <cat:rewriteURI
- uriStartString="urn:x-funny:"
- rewritePrefix="urn:funny:" />
-
- <cat:systemSuffix
- systemIdSuffix="schemas/goof.xml"
- uri="../schemas/2009/goof-v2.xml" />
-
- <cat:uriSuffix
- uriSuffix="schemas/goof.xml"
- uri="../schemas/2009/fun-v2.xml" />
-
- <cat:group prefer="public">
- <cat:public id="idvalue2" publicId="Sleepy" uri="http://tempuri.org" />
- <cat:system systemId="http://old-DTD-location.org/" uri="http://www.new-location.com/"/>
- </cat:group>
-
-</cat:catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml
deleted file mode 100644
index 124bc14..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/deletemecatalog.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="InvoiceId_test" uri="./Invoice/Invoice.dtd" webURL="http://webURL"/>
- <system systemId="Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="yes" property="value1"/>
- <uri name="http://www.test.com/Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="no" property="value2"/>
- <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml
deleted file mode 100644
index d283dee..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="ISO 8879:1986//ENTITIES Publishing//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-pub.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk1.ent"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbpoolx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-box.ent"/>
- <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/docbookx.dtd"/>
- <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk3.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsn.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-num.ent"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbcentx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk4.ent"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbnotnx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-dia.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk2.ent"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbgenent.mod"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbhierx.mod"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsa.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amso.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-cyrl.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES General Technical//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-tech.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsc.ent"/>
- <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="xml-dtd-4.2-1.0-17.2/soextblx.dtd"/>
- <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/calstblx.dtd"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-lat1.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsb.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-lat2.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsr.ent"/>
- <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-cyr2.ent"/>
- <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="xml-dtd-4.1.2-1.0-17.2"/>
- <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="xml-dtd-4.1.2-1.0-17.2"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbpoolx.mod"/>
- <public publicId="-//OASIS//DTD DocBook XML V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/docbookx.dtd"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbcentx.mod"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbnotnx.mod"/>
- <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbgenent.mod"/>
- <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbhierx.mod"/>
- <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/calstblx.dtd"/>
- <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="xml-dtd-4.2-1.0-17.2"/>
- <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="xml-dtd-4.2-1.0-17.2"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml
deleted file mode 100644
index a67cd07..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
- <uri name="http://apache.org/xml/xcatalog/example" uri="./example/example.xsd"/>
- <system systemId="myexample.xsd" uri="./example/example-nonamespace.xsd"/>
-
- <delegatePublic publicIdStartString="-//A//"
- catalog="example-catalog2.xml"/>
-
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml
deleted file mode 100644
index 18bb1ef..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
- <public publicId="-//A//XML CATALOG IDENTIFIER//EN"
- uri="./example/example.ent"/>
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml
deleted file mode 100644
index 94aaae9..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE root [
- <!ENTITY text PUBLIC "-//A//XML CATALOG IDENTIFIER//EN"
- "urn:publicid:-:A:XML+CATALOG+IDENTIFIER:EN">
-]>
-<root>&text;</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd
deleted file mode 100644
index ef2998d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="root" type="xs:anyURI"/>
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml
deleted file mode 100644
index 39175f1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="myexample.xsd">
-http://apache.org/xml/anyURI</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml
deleted file mode 100644
index f97cb3b..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns="http://apache.org/xml/xcatalog/example">
-http://apache.org/xml/anyURI</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent
deleted file mode 100644
index cd08755..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd
deleted file mode 100644
index 41a29fe..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://apache.org/xml/xcatalog/example"
- targetNamespace="http://apache.org/xml/xcatalog/example">
- <xs:element name="root" type="xs:anyURI"/>
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml
deleted file mode 100644
index bf127b1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
-
- <uri name="http://www.example.com/Report"
- uri="./PurchaseOrder/international/report_.xsd" />
- <!-- we can not map PublicId or URI of the included/redefined schemas -->
- <uri name="http://www.example.com/IPO"
- uri="./PurchaseOrder/international/ipo_.xsd" />
- <system systemId="address_.xsd"
- uri="./PurchaseOrder/international/address.xsd" />
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml
deleted file mode 100644
index 734ecba..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- prefer="public">
-
- <uri name="http://www.example.com/Report"
- uri="./PurchaseOrder/international/report_.xsd" />
- <!-- we can not map PublicId or URI of the included/redefined schemas -->
- <uri name="http://www.example.com/IPO"
- uri="./PurchaseOrder/international/ipo.xsd" />
-
-
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml
deleted file mode 100644
index c66a1b9..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
- <uri name="http://www.example.com/Report"
- uri="./PurchaseOrder/international/report_.xsd" />
- <system systemId="ipo__.xsd"
- uri="./PurchaseOrder/international/ipo_.xsd" />
- <system systemId="address_.xsd"
- uri="./PurchaseOrder/international/address.xsd" />
-
-</catalog>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar b/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar
deleted file mode 100644
index 9d1e4da..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml
deleted file mode 100644
index 98b04a1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" xml:base=".">
- <public publicId="myquote" uri="quote2.xml"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml
deleted file mode 100644
index 1fcba52..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
- <!-- I belong to:
- org.apache.tools.ant.types.XMLCatalogBuildFileTest.java
- -->
-
-<para>
- A stitch in time saves nine
-</para>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml
deleted file mode 100644
index 10cd14e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<para>
- No news is good news
-</para>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl
deleted file mode 100644
index e692b0e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
- <xsl:output method="text"/>
-
- <!-- name of the output parameter to write -->
- <xsl:param name="outprop">value</xsl:param>
-
- <xsl:strip-space elements="*"/>
-
- <xsl:template match="/">
- <xsl:value-of select="$outprop"/>: <xsl:apply-templates select="/fragment/para"/>
- </xsl:template>
-
- <!-- This will only be matched in doc2.xml -->
- <xsl:template match="Ref">
- <xsl:apply-templates select="document(@file)/fragment/para"/>
- </xsl:template>
-
- <!-- This will only be matched in doc1.xml -->
- <xsl:template match="text()">
- <xsl:value-of select="normalize-space(.)"/>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml
deleted file mode 100644
index 11c730d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE fragment [
- <!ENTITY quote PUBLIC "myquote" "quote1.xml">
-]>
-
-<fragment>
- <para>
- "e;
- </para>
-</fragment>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml
deleted file mode 100644
index dd41d0b..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<fragment>
- <para>
- <Ref file="xmlcatalog1.xml"/>
- </para>
-</fragment>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out
deleted file mode 100644
index e9d7fc5..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out
+++ /dev/null
@@ -1 +0,0 @@
-testvalue: A stitch in time saves nine
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff
deleted file mode 100644
index 987a5db..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff
+++ /dev/null
@@ -1,2 +0,0 @@
-<<<< testvalue: A stitch in time saves nine
-<<<< testvalue: No news is good news
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result
deleted file mode 100644
index 1de28a7..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result
+++ /dev/null
@@ -1 +0,0 @@
-testvalue: No news is good news
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd
deleted file mode 100644
index e99645a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/XSL/Transform">
- <!-- xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" /-->
-
- <xsd:element name="stylesheet" type="wrapper" />
- <xsd:element name="transform" type="wrapper" />
-
- <xsd:complexType name="wrapper">
- <xsd:group ref="topLevelElements" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="extension-element-prefixes" type="xsd:string" use="optional" />
- <xsd:attribute name="exclude-result-prefixes" type="xsd:string" use="optional" />
- <xsd:attribute name="id" type="xsd:ID" use="optional" />
- <xsd:attribute name="version" type="xsd:NMTOKEN" use="optional" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
-
- <xsd:element name="import">
- <xsd:complexType>
- <xsd:attribute name="href" type="xsd:anyURI" use="required" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="include">
- <xsd:complexType>
- <xsd:attribute name="href" type="xsd:anyURI" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="strip-space">
- <xsd:complexType>
- <xsd:attribute name="elements" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="preserve-space">
- <xsd:complexType>
- <xsd:attribute name="elements" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="output">
- <xsd:complexType>
- <xsd:attribute name="method" use="optional">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="xml" />
- <xsd:enumeration value="html" />
- <xsd:enumeration value="text" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="version" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="encoding" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="omit-xml-declaration" use="optional" type="YesNoType" />
- <xsd:attribute name="standalone" use="optional" type="YesNoType" />
- <xsd:attribute name="doctype-public" type="xsd:string" use="optional" />
- <xsd:attribute name="doctype-system" type="xsd:string" use="optional" />
- <xsd:attribute name="cdata-section-elements" type="xsd:NMTOKENS" use="optional" />
- <xsd:attribute name="indent" use="optional" type="YesNoType" />
- <xsd:attribute name="media-type" type="xsd:string" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="key">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- <xsd:attribute name="match" type="pattern" use="required" />
- <xsd:attribute name="use" type="expression" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="decimal-format">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute default="." name="decimal-separator" type="xsd:string" />
- <xsd:attribute default="," name="grouping-separator" type="xsd:string" />
- <xsd:attribute default="Infinity" name="infinity" type="xsd:string" />
- <xsd:attribute default="-" name="minus-sign" type="xsd:string" />
- <xsd:attribute default="NaN" name="NaN" type="xsd:string" />
- <xsd:attribute default="%" name="percent" type="xsd:string" />
- <xsd:attribute default="‰" name="per-mille" type="xsd:string" />
- <xsd:attribute default="0" name="zero-digit" type="xsd:string" />
- <xsd:attribute default="#" name="digit" type="xsd:string" />
- <xsd:attribute default=";" name="pattern-separator" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="namespace-alias">
- <xsd:complexType>
- <xsd:attribute name="stylesheet-prefix" type="xsd:string" use="required" />
- <xsd:attribute name="result-prefix" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="template">
- <xsd:complexType mixed="true">
- <xsd:sequence>
- <xsd:element ref="param" minOccurs="0" maxOccurs="unbounded" />
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:any namespace="##other" processContents="skip" />
- </xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="match" type="pattern" use="optional" />
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="priority" type="xsd:NMTOKEN" use="optional" />
- <xsd:attribute name="mode" type="xsd:NMTOKEN" use="optional" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="value-of">
- <xsd:complexType>
- <xsd:attributeGroup ref="select-required" />
- <xsd:attributeGroup ref="disable-output-escaping" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="copy-of">
- <xsd:complexType>
- <xsd:attributeGroup ref="select-required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="number">
- <xsd:complexType>
- <xsd:attribute default="single" name="level">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="single" />
- <xsd:enumeration value="multiple" />
- <xsd:enumeration value="any" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="count" type="pattern" use="optional"/>
- <xsd:attribute name="from" type="pattern" use="optional"/>
- <xsd:attribute name="value" type="expression" use="optional"/>
- <xsd:attribute default="1" name="format" type="xsd:string" />
- <xsd:attribute name="lang" type="xsd:string" use="optional" />
- <xsd:attribute name="letter-value" type="xsd:string" use="optional" />
- <xsd:attribute name="grouping-separator" type="xsd:string" use="optional" />
- <xsd:attribute name="grouping-size" type="xsd:string" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="apply-templates">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element ref="sort" />
- <xsd:element ref="with-param" />
- </xsd:choice>
- <xsd:attribute default="node()" name="select" type="expression" />
- <xsd:attribute name="mode" type="xsd:NMTOKEN" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="apply-imports">
- <xsd:complexType />
- </xsd:element>
-
- <xsd:element name="for-each">
- <xsd:complexType mixed="true">
- <xsd:sequence>
- <xsd:element ref="sort" minOccurs="0" maxOccurs="unbounded" />
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:any namespace="##other" processContents="skip" />
- </xsd:choice>
- </xsd:sequence>
- <xsd:attributeGroup ref="select-required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="sort">
- <xsd:complexType>
- <xsd:attribute default="." name="select" type="expression" />
- <xsd:attribute name="lang" type="xsd:string" use="optional" />
- <xsd:attribute default="text" name="data-type" type="xsd:string" />
- <xsd:attribute default="ascending" name="order" type="xsd:string" />
- <xsd:attribute name="case-order" type="xsd:string" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="if">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded"></xsd:group>
- <xsd:attribute name="test" type="expression" use="required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="choose">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="when" minOccurs="1" maxOccurs="unbounded" />
- <xsd:element ref="otherwise" minOccurs="0" />
- </xsd:sequence>
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="when">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="test" type="expression" use="required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="otherwise">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="attribute-set">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="attribute" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- <xsd:attribute name="use-attribute-sets" type="xsd:NMTOKENS" use="optional" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="call-template">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="with-param" minOccurs="0" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="with-param" type="NamedAndSelectable" />
-
- <xsd:element name="variable" type="NamedAndSelectable" />
-
- <xsd:element name="param" type="NamedAndSelectable" />
-
- <xsd:element name="text">
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attributeGroup ref="disable-output-escaping" />
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="processing-instruction">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="element">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions"></xsd:group>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="namespace" type="xsd:string" use="optional" />
- <xsd:attributeGroup ref="use-attribute-sets" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="attribute">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"/>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- <xsd:attribute name="namespace" type="xsd:string" use="optional" />
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="comment">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"/>
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="copy">
- <xsd:complexType mixed="true">
- <xsd:group ref="instructions"/>
- <!-- xsd:attribute ref="xml:space" /-->
- <xsd:attributeGroup ref="use-attribute-sets" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="message">
- <xsd:complexType mixed="true">
- <xsd:group ref="char-instructions"/>
- <xsd:attribute default="no" name="terminate" type="YesNoType" />
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="fallback">
- <xsd:complexType mixed="true">
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:group ref="instructions"></xsd:group>
- </xsd:choice>
- <!-- xsd:attribute ref="xml:space" /-->
- </xsd:complexType>
- </xsd:element>
-
- <xsd:group name="instructions">
- <xsd:choice>
- <xsd:group ref="char-instructions"></xsd:group>
- <xsd:element ref="processing-instruction" />
- <xsd:element ref="comment" />
- <xsd:element ref="element" />
- <xsd:element ref="attribute" />
- </xsd:choice>
- </xsd:group>
-
- <xsd:group name="char-instructions">
- <xsd:choice>
- <xsd:element ref="apply-templates" />
- <xsd:element ref="call-template" />
- <xsd:element ref="apply-imports" />
- <xsd:element ref="for-each" />
- <xsd:element ref="value-of" />
- <xsd:element ref="copy-of" />
- <xsd:element ref="number" />
- <xsd:element ref="choose" />
- <xsd:element ref="if" />
- <xsd:element ref="text" />
- <xsd:element ref="copy" />
- <xsd:element ref="variable" />
- <xsd:element ref="message" />
- <xsd:element ref="fallback" />
- </xsd:choice>
- </xsd:group>
-
- <xsd:group name="topLevelElements">
- <xsd:choice>
- <xsd:element ref="import" />
- <xsd:element ref="include" />
- <xsd:element ref="strip-space" />
- <xsd:element ref="preserve-space" />
- <xsd:element ref="key" />
- <xsd:element ref="decimal-format" />
- <xsd:element ref="attribute-set" />
- <xsd:element ref="namespace-alias" />
- <xsd:element ref="param" />
- <xsd:element ref="variable" />
- <xsd:element ref="output" />
- <xsd:element ref="template" />
- </xsd:choice>
- </xsd:group>
-
- <xsd:simpleType name="YesNoType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="yes" />
- <xsd:enumeration value="no" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="NamedAndSelectable" mixed="true">
- <xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
- <xsd:attributeGroup ref="select-optional" />
- </xsd:complexType>
-
-
- <xsd:simpleType name="expression">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
- <xsd:simpleType name="pattern">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:attributeGroup name="select-optional">
- <xsd:attribute name="select" type="expression" />
- </xsd:attributeGroup>
- <xsd:attributeGroup name="select-required">
- <xsd:attribute name="select" type="expression" use="required" />
- </xsd:attributeGroup>
- <xsd:attributeGroup name="disable-output-escaping">
- <xsd:attribute name="disable-output-escaping" type="YesNoType" default="no" />
- </xsd:attributeGroup>
- <xsd:attributeGroup name="use-attribute-sets">
- <xsd:attribute name="use-attribute-sets" type="xsd:NMTOKENS" use="optional"/>
- </xsd:attributeGroup>
-
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/xmlcatalog11.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/xmlcatalog11.xsd
deleted file mode 100644
index 6082d1d..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/xmlcatalog11.xsd
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:er="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- targetNamespace="urn:oasis:names:tc:entity:xmlns:xml:catalog"
- elementFormDefault="qualified">
-
- <!-- $Id: xmlcatalog11.xsd,v 1.1 2010/03/08 20:44:30 jmoller Exp $ -->
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"/>
-
- <xs:simpleType name="pubIdChars">
- <!-- A string of the characters defined as pubIdChar in production 13
- of the Second Edition of the XML 1.0 Recommendation. Does not include
- the whitespace characters because they're normalized by XML parsing. -->
- <xs:restriction base="xs:string">
- <xs:pattern value="[a-zA-Z0-9\-'\(\)+,./:=?;!*#@$_%]*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="publicIdentifier">
- <xs:restriction base="er:pubIdChars"/>
- </xs:simpleType>
-
- <xs:simpleType name="partialPublicIdentifier">
- <xs:restriction base="er:pubIdChars"/>
- </xs:simpleType>
-
- <xs:simpleType name="systemOrPublic">
- <xs:restriction base="xs:string">
- <xs:enumeration value="system"/>
- <xs:enumeration value="public"/>
- </xs:restriction>
- </xs:simpleType>
-
- <!-- The global attribute xml:base is not explicitly declared; -->
- <!-- it is allowed by the anyAttribute declarations. -->
-
- <xs:complexType name="catalog">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="er:public"/>
- <xs:element ref="er:system"/>
- <xs:element ref="er:uri"/>
- <xs:element ref="er:rewriteSystem"/>
- <xs:element ref="er:rewriteURI"/>
- <xs:element ref="er:uriSuffix"/>
- <xs:element ref="er:systemSuffix"/>
- <xs:element ref="er:delegatePublic"/>
- <xs:element ref="er:delegateSystem"/>
- <xs:element ref="er:delegateURI"/>
- <xs:element ref="er:nextCatalog"/>
- <xs:element ref="er:group"/>
- <xs:any namespace="##other" processContents="skip"/>
- </xs:choice>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute name="prefer" type="er:systemOrPublic"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:complexType name="public">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="publicId" type="er:publicIdentifier"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="system">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemId" type="xs:string"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="uri">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="name" type="xs:anyURI"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="rewriteSystem">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="rewriteURI">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="systemSuffix">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdSuffix"
- type="xs:string"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="uriSuffix">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriSuffix"
- type="xs:string"
- use="required"/>
- <xs:attribute name="uri" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="delegatePublic">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="publicIdStartString"
- type="er:partialPublicIdentifier"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="delegateSystem">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="systemIdStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="delegateURI">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="uriStartString"
- type="xs:string"
- use="required"/>
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="nextCatalog">
- <xs:complexContent>
- <xs:restriction base="xs:anyType">
- <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="group">
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="er:public"/>
- <xs:element ref="er:system"/>
- <xs:element ref="er:uri"/>
- <xs:element ref="er:rewriteSystem"/>
- <xs:element ref="er:rewriteURI"/>
- <xs:element ref="er:uriSuffix"/>
- <xs:element ref="er:systemSuffix"/>
- <xs:element ref="er:delegatePublic"/>
- <xs:element ref="er:delegateSystem"/>
- <xs:element ref="er:delegateURI"/>
- <xs:element ref="er:nextCatalog"/>
- <xs:any namespace="##other" processContents="skip"/>
- </xs:choice>
- <xs:attribute name="prefer" type="er:systemOrPublic"/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="catalog" type="er:catalog"/>
- <xs:element name="public" type="er:public"/>
- <xs:element name="system" type="er:system"/>
- <xs:element name="uri" type="er:uri"/>
- <xs:element name="rewriteSystem" type="er:rewriteSystem"/>
- <xs:element name="rewriteURI" type="er:rewriteURI"/>
- <xs:element name="systemSuffix" type="er:systemSuffix"/>
- <xs:element name="uriSuffix" type="er:uriSuffix"/>
- <xs:element name="delegatePublic" type="er:delegatePublic"/>
- <xs:element name="delegateSystem" type="er:delegateSystem"/>
- <xs:element name="delegateURI" type="er:delegateURI"/>
- <xs:element name="nextCatalog" type="er:nextCatalog"/>
- <xs:element name="group" type="er:group"/>
-
-</xs:schema>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/plugin.properties b/tests/org.eclipse.wst.xml.catalog.tests/plugin.properties
deleted file mode 100644
index f738c97..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.catalog.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = XML Catalog Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml b/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
deleted file mode 100644
index 4c75c79..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension point="org.eclipse.wst.xml.core.catalogContributions">
- <catalogContribution>
- <system id="testSystemId"
- systemId="http://personal/personal.dtd"
- uri="data/Personal/personal.dtd">
- </system>
- <public id="testPublicId1"
- publicId="InvoiceId_test"
- uri="data/Invoice/Invoice.dtd"
- webURL="http://org.eclipse.wst.xml.example/Invoice.dtd">
- </public>
- <uri id="testUriId1"
- name="http://apache.org/xml/xcatalog/example"
- uri="data/example/example.xsd"/>
- <uri id="testURIId2"
- name="http://www.w3.org/2001/XMLSchema"
- uri="platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd">
- </uri>
- <nextCatalog id="testNestedCatalog"
- catalog="data/catalog1.xml"/>
- </catalogContribution>
- </extension>
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java
deleted file mode 100644
index e2b63d1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.catalog.tests.internal;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogContributorRegistryReader;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.osgi.framework.Bundle;
-
-public abstract class AbstractCatalogTest extends TestCase
-{
- private CatalogSet catalogSet = new CatalogSet();
-
- protected ICatalog systemCatalog;
-
- protected ICatalog userCatalog;
-
- protected ICatalog defaultCatalog;
-
-
- public AbstractCatalogTest(String name)
- {
- super(name);
-
- }
-
- protected static List getCatalogEntries(ICatalog catalog, int entryType)
- {
- List result = new ArrayList();
- ICatalogEntry[] entries = catalog.getCatalogEntries();
- for (int i = 0; i < entries.length; i++)
- {
- ICatalogEntry entry = entries[i];
- if (entry.getEntryType() == entryType)
- {
- result.add(entry);
- }
- }
- return result;
- }
-
- protected ICatalog getCatalog(String id, String uriString) throws Exception
- {
- return catalogSet.lookupOrCreateCatalog(id, uriString);
- }
-
-
- public void initCatalogs()
- {
- defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog catalog = nextCatalogs[i];
- ICatalog referencedCatalog = catalog.getReferencedCatalog();
- if (referencedCatalog != null)
- {
- if (XMLCorePlugin.SYSTEM_CATALOG_ID
- .equals(referencedCatalog.getId()))
- {
- systemCatalog = referencedCatalog;
- } else if (XMLCorePlugin.USER_CATALOG_ID
- .equals(referencedCatalog.getId()))
- {
- userCatalog = referencedCatalog;
- }
- }
- }
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- initCatalogs();
- }
-
- protected static String makeAbsolute(String baseLocation, String location)
- {
- URL local = null;
- location = location.replace('\\', '/');
- try
- {
- URL baseURL = new URL(baseLocation);
- local = new URL(baseURL, location);
- } catch (MalformedURLException e)
- {
- }
-
- if (local != null)
- {
- return local.toString();
- } else
- {
- return location;
- }
- }
-
- protected static URL resolvePluginLocation(String pluginId){
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null)
- {
- URL bundleEntry = bundle.getEntry("/");
- try
- {
- return FileLocator.resolve(bundleEntry);
- } catch (IOException e)
- {
- e.printStackTrace();
- }
- }
- return null;
- }
-
- // see CatalogContributorRegistryReader.resolvePath(String path)
- protected String resolvePath(String pluginId, String path)
- {
-
- return CatalogContributorRegistryReader.resolvePath(
- CatalogContributorRegistryReader.getPlatformURL(pluginId), path);
- }
-
-
- protected String getFileLocation(String path) {
- String result = null;
- try {
- result = FileLocator.toFileURL(FileLocator.find(TestPlugin.getDefault().getBundle(), new Path(path), null)).toString();
- } catch (IOException e) {}
- return URIHelper.ensureFileURIProtocolFormat(result);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java
deleted file mode 100644
index d658c7a..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.catalog.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.eclipse.wst.xml.catalog.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(CatalogReaderTest.class);
- suite.addTestSuite(CatalogResolverTest.class);
- suite.addTestSuite(CatalogWriterTest.class);
- suite.addTestSuite(CatalogContributorRegistryReaderTest.class);
- suite.addTestSuite(CatalogTest.class);
- //$JUnit-END$
- return suite;
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java
deleted file mode 100644
index 0b001c1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.catalog.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-
-public class CatalogContributorRegistryReaderTest extends AbstractCatalogTest
-{
- protected void setUp() throws Exception
- {
- super.setUp();
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- public CatalogContributorRegistryReaderTest(String name)
- {
- super(name);
- }
-
- public final void testReadRegistry() throws Exception
- {
- assertNotNull(defaultCatalog);
- assertEquals(XMLCorePlugin.DEFAULT_CATALOG_ID, defaultCatalog.getId());
- assertEquals(2, defaultCatalog.getNextCatalogs().length);
-
- String pluginId = TestPlugin.getDefault().getBundle().getSymbolicName();
-
- // test system entries
- assertNotNull(systemCatalog);
- List entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
- for (int i = 0; i < entries.size(); i++)
- {
- ICatalogEntry entry = (ICatalogEntry)entries.get(i);
- if("testSystemId".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/Personal/personal.dtd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://personal/personal.dtd", entry.getKey());
- }
- }
-
- // test public entries
- entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- for (int i = 0; i < entries.size(); i++)
- {
- ICatalogEntry entry = (ICatalogEntry)entries.get(i);
- if("testPublicId1".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/Invoice/Invoice.dtd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- // test user defined attributes
- assertEquals("http://org.eclipse.wst.xml.example/Invoice.dtd", entry.getAttributeValue("webURL"));
-
- }
-
- else if("testMappingInfo".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://www.w3.org/2001/XMLSchema1", entry.getKey());
- }
-
- }
-
- // test uri entries
- entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_URI);
- for (int i = 0; i < entries.size(); i++)
- {
- ICatalogEntry entry = (ICatalogEntry)entries.get(i);
- if("testURIId1".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/example/example.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://apache.org/xml/xcatalog/example", entry.getKey());
- }
- else if("testURIId2".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://www.w3.org/2001/XMLSchema", entry.getKey());
- }
- else if("testURIId3".equals(entry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "jar:platform:/plugin/org.eclipse.wst.xml.catalog.tests/data/schemas.jar!/data/catalog.xsd");
- assertEquals(resolvedURI, entry.getURI());
- assertEquals("http://oasis.names.tc.entity.xmlns.xml.catalog", entry.getKey());
- }
- }
-
- // test tested catalog
- INextCatalog[] nextCatalogEntries = systemCatalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogEntries.length; i++)
- {
- INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[i];
- if("testNestedCatalog".equals(nextCatalogEntry.getId()))
- {
- String resolvedURI = resolvePath(pluginId, "data/catalog1.xml");
- assertEquals(resolvedURI, nextCatalogEntry.getCatalogLocation());
- ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
- assertNotNull(nextCatalog);
- assertEquals(3, nextCatalog.getCatalogEntries().length);
- // test public entries
- entries = CatalogTest.getCatalogEntries(nextCatalog,
- ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry) entries.get(0);
- //URI uri = URIHelper.getURIForFilePath(resolvedURI);
- //resolvedURI = URIHelper.makeAbsolute(uri.toURL(), "./Invoice/Invoice.dtd");
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- // test system entries
- entries = CatalogTest.getCatalogEntries(nextCatalog,
- ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("Invoice.dtd", entry.getKey());
- // test uri entries
- entries = CatalogTest.getCatalogEntries(nextCatalog,
- ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
deleted file mode 100644
index 00dd0cd..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.catalog.tests.internal;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-public class CatalogReaderTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogReaderTest(String name) {
- super(name);
- }
-
-
- /*
- * Class under test for void read(ICatalog, String)
- */
- public void testReadCatalog()throws Exception {
-
- //read catalog
- String catalogFile = "/data/catalog1.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("catalog1", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(3, catalog.getCatalogEntries().length);
-
- // test public entries
- List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry)entries.get(0);
- //String resolvedURI = URIHelper.makeAbsolute(base, "./Invoice/Invoice.dtd");
-
-
- assertEquals(getFileLocation("/data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
-
- // test system entries
- entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals(getFileLocation("/data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("Invoice.dtd", entry.getKey());
- assertEquals("yes", entry.getAttributeValue("chached"));
- assertEquals("value1", entry.getAttributeValue("property"));
-
-
- // test uri entries
- entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals(getFileLocation("/data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
- assertEquals("no", entry.getAttributeValue("chached"));
- assertEquals("value2", entry.getAttributeValue("property"));
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
-// String catalogRefId = nextCatalogEntry.getCatalogRefId();
-// assertEquals("nextCatalog1", catalogRefId);
- //resolvedURI = URIHelper.makeAbsolute(base, "catalog2.xml");
- assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
-
- ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
-
- assertNotNull(nextCatalog);
- assertEquals(4, nextCatalog.getCatalogEntries().length);
-
- // test public entries
- entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(2, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- //resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalogue/Catalogue.xsd");
- assertEquals(getFileLocation("/data/PublicationCatalogue/Catalogue.xsd"), entry.getURI());
- assertEquals("http://www.eclipse.org/webtools/Catalogue_001", entry.getKey());
-
- // test public entry from a group
- entry = (ICatalogEntry)entries.get(1);
- //resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalogue/Catalogue.xsd");
- assertEquals(getFileLocation("/data/PublicationCatalogue/Catalogue.xsd"), entry.getURI());
- assertEquals("http://www.eclipse.org/webtools/Catalogue_002", entry.getKey());
-
- // test system entries
- entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals(getFileLocation("/data/PublicationCatalogue/Catalogue.xsd"), entry.getURI());
- assertEquals("Catalogue.xsd", entry.getKey());
- // test uri entries
- entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry)entries.get(0);
- assertEquals("http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd", entry.getURI());
- assertEquals("http://www.eclipse.org/webtools/Catalogue.xsd", entry.getKey());
-
-
- }
-
- /*
- * Class under test for void read(ICatalog, String)
- */
- public void testReadComplexCatalog() throws Exception {
-
- //read catalog
- String catalogFile = "/data/delegateAndRewrite/catalog11.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("catalog11", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(13, catalog.getCatalogElements().length);
-
- // test public entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC).size());
-
- // test system entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM).size());
-
- // test uri entries
- assertEquals(1, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI).size());
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
- assertEquals("catalog.xml", nextCatalogEntry.getCatalogLocation());
- }
-
-
- public void testCompatabilityReader() throws Exception {
- // read catalog
- String catalogFile = "/data/compatabilityTest.xmlcatalog";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("compatabilityCatalog", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
- List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry)entries.get(0);
- assertEquals("platform:/resource/XMLExamples/Invoice2/Invoice.dtd", entry.getURI());
- assertEquals("InvoiceId", entry.getKey());
- }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java
deleted file mode 100644
index 80f4535..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.catalog.tests.internal;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-
-
-public class CatalogResolverTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogResolverTest(String name) {
- super(name);
- }
-
- public final void testResolveResolver() throws Exception {
-
-
- // from plugin.xml file
- String pluginBase = resolvePluginLocation(TestPlugin.getDefault().getBundle().getSymbolicName()).toString();
-
- String resolvedActual = defaultCatalog.resolvePublic("InvoiceId_test", null);
- String resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(resolvedURI, resolvedActual);
- resolvedActual = defaultCatalog.resolveSystem("http://personal/personal.dtd");
- resolvedURI = makeAbsolute(pluginBase, "data/Personal/personal.dtd");
- assertEquals(resolvedURI, resolvedActual);
- resolvedActual = defaultCatalog.resolveURI("http://apache.org/xml/xcatalog/example");
- resolvedURI = makeAbsolute(pluginBase, "data/example/example.xsd");
- assertEquals(resolvedURI, resolvedActual);
- resolvedActual = defaultCatalog.resolveURI("http://www.w3.org/2001/XMLSchema");
- resolvedURI = resolvePath("", "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
- resolvedURI = makeAbsolute(pluginBase, resolvedURI);
- assertEquals(resolvedURI, resolvedActual);
-
- // from catalog1.xml
- resolvedActual = defaultCatalog.resolvePublic("InvoiceId_test", null);
- resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(resolvedURI, resolvedActual);
-
- resolvedActual = defaultCatalog.resolveSystem("Invoice.dtd");
- resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- resolvedActual = defaultCatalog.resolveURI("http://www.test.com/Invoice.dtd");
- resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
-
- // from catalog2.xml
- resolvedActual = defaultCatalog.resolvePublic("http://www.eclipse.org/webtools/Catalogue_001", null);
- resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalogue/Catalogue.xsd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- resolvedActual = defaultCatalog.resolvePublic("http://www.eclipse.org/webtools/Catalogue_002", null);
- resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalogue/Catalogue.xsd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- resolvedActual = defaultCatalog.resolveSystem("Catalogue.xsd");
- resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalogue/Catalogue.xsd");
- assertEquals(URIHelper.ensureFileURIProtocolFormat(resolvedURI), resolvedActual);
-
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java
deleted file mode 100644
index 16afc3e..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.catalog.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-
-
-
-public class CatalogTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogTest(String name) {
- super(name);
- }
-
- public void testCatalog() throws Exception
- {
- Catalog workingUserCatalog = new Catalog(null, "working", null);
- assertNotNull(userCatalog);
- workingUserCatalog.addEntriesFromCatalog(userCatalog);
-
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("testKey");
- catalogEntry.setURI("http://testuri");
- workingUserCatalog.addCatalogElement(catalogEntry);
-
- userCatalog.addEntriesFromCatalog(workingUserCatalog);
- String userCatalogLocation = userCatalog.getLocation();
-
- userCatalog.save();
- userCatalog.clear();
-
- userCatalog = getCatalog(XMLCorePlugin.USER_CATALOG_ID, userCatalogLocation);
-
- List entries = getCatalogEntries(userCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-
- assertEquals("http://testuri", entry.getURI());
- assertEquals("testKey", entry.getKey());
-
-
- }
-
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
deleted file mode 100644
index 20fd703..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.catalog.tests.internal;
-
-import java.io.File;
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-public class CatalogWriterTest extends AbstractCatalogTest {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public CatalogWriterTest(String name) {
- super(name);
- }
-
- public final void testWrite() throws Exception {
-
- // read catalog
- String catalogFile = "/data/catalog1.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
- catalogFile);
- assertNotNull(catalogUrl);
- URL resolvedURL = FileLocator.resolve(catalogUrl);
-
- Catalog testCatalog = (Catalog) getCatalog("catalog1", resolvedURL
- .toString());
- assertNotNull(testCatalog);
- testCatalog.setBase(resolvedURL.toString());
- // CatalogReader.read(testCatalog, resolvedURL.getFile());
- assertNotNull(testCatalog);
-
- // write catalog
- URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/");
- IPath path = new Path(FileLocator.resolve(resultsFolder).getFile());
- String resultCatalogFile = path.append("/catalog1.xml").toFile().toURI().toString();
- testCatalog.setLocation(resultCatalogFile);
-
-
-
- // write catalog
- testCatalog.save();
-
- // read catalog file from the saved location and test its content
- Catalog catalog = (Catalog) getCatalog("catalog2", testCatalog.getLocation());
- assertNotNull(catalog);
-
-
-
- // test saved catalog - catalog1.xml
- assertEquals(3, catalog.getCatalogEntries().length);
-
- // test public entries
- List entries = CatalogTest.getCatalogEntries(catalog,
- ICatalogEntry.ENTRY_TYPE_PUBLIC);
- assertEquals(1, entries.size());
- ICatalogEntry entry = (ICatalogEntry) entries.get(0);
-
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("InvoiceId_test", entry.getKey());
- assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
- // test system entries
- entries = CatalogTest.getCatalogEntries(catalog,
- ICatalogEntry.ENTRY_TYPE_SYSTEM);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("Invoice.dtd", entry.getKey());
- assertEquals("yes", entry.getAttributeValue("chached"));
- assertEquals("value1", entry.getAttributeValue("property"));
-
- // test uri entries
- entries = CatalogTest.getCatalogEntries(catalog,
- ICatalogEntry.ENTRY_TYPE_URI);
- assertEquals(1, entries.size());
- entry = (ICatalogEntry) entries.get(0);
- assertEquals(getFileLocation("data/Invoice/Invoice.dtd"), entry.getURI());
- assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
- assertEquals("no", entry.getAttributeValue("chached"));
- assertEquals("value2", entry.getAttributeValue("property"));
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
- assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
- }
-
- public final void testBug235445() throws Exception {
- // read catalog
- String catalogFile = "/data/deletemecatalog.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
- catalogFile);
- assertNotNull(catalogUrl);
- URL resolvedURL = FileLocator.resolve(catalogUrl);
-
- Catalog testCatalog = (Catalog) getCatalog("deletemecatalog", resolvedURL
- .toString());
- assertNotNull(testCatalog);
- testCatalog.setBase(resolvedURL.toString());
- // CatalogReader.read(testCatalog, resolvedURL.getFile());
- assertNotNull(testCatalog);
-
- // write catalog
- URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/");
- IPath path = new Path(FileLocator.resolve(resultsFolder).getFile());
- final File catalogIOFile = path.append("/deletemecatalog.xml").toFile();
- String resultCatalogFile = catalogIOFile.toURI().toString();
- testCatalog.setLocation(resultCatalogFile);
-
- // write catalog
- testCatalog.save();
-
- IWorkspaceRunnable deleteOp = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException
- {
- try {
- catalogIOFile.delete();
- } catch (Exception e) {
- assertTrue("exception thrown when trying to delete catalog", false);
- }
- }
- };
-
- ResourcesPlugin.getWorkspace().run(deleteOp, null);
- assertFalse("catalog file was not deleted", catalogIOFile.exists());
- }
-
-
- /*
- * Class under test for void read(ICatalog, String)
- */
- public void testReadAndWriteComplexCatalog() throws Exception {
-
- //read catalog
- String catalogFile = "/data/delegateAndRewrite/catalog11.xml";
- URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
- assertNotNull(catalogUrl);
- URL base = FileLocator.resolve(catalogUrl);
-
- Catalog catalog = (Catalog)getCatalog("catalog11", base.toString());
- //CatalogReader.read(catalog, catalogFilePath);
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(13, catalog.getCatalogElements().length);
-
- // write catalog so we can read it back in
- URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
- "/");
- IPath path = new Path(FileLocator.resolve(resultsFolder).getFile());
- String resultCatalogFile = path.append("/catalog11-x.xml").toFile().toURI().toString();
- catalog.setLocation(resultCatalogFile);
-
-
-
- // write catalog
- catalog.save();
-
- // read catalog file from the saved location and test its content
- catalog = (Catalog) getCatalog("catalog2", catalog.getLocation());
- assertNotNull(catalog);
-
- // test main catalog - catalog1.xml
- //assertEquals("cat1", catalog.getId());
- assertEquals(13, catalog.getCatalogElements().length);
-
- // test public entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC).size());
-
- // test system entries
- assertEquals(2, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM).size());
-
- // test uri entries
- assertEquals(1, CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI).size());
-
- // test next catalog - catalog2.xml
- INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
- assertEquals(1, nextCatalogEntries.length);
-
- INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
- assertNotNull(nextCatalogEntry);
-
- assertEquals("catalog.xml", nextCatalogEntry.getCatalogLocation());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java
deleted file mode 100644
index 72acda6..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.catalog.tests.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestPlugin extends Plugin {
- //The shared instance.
- private static TestPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public TestPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = TestPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wst.xml.catalog.test.TestPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
-
- public static String resolvePluginLocation(String path) throws IOException {
- URL url = getDefault().getBundle().getEntry(path);
- url = FileLocator.resolve(url);
- return url.getFile();
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/test.xml b/tests/org.eclipse.wst.xml.catalog.tests/test.xml
deleted file mode 100644
index 4b384c1..0000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- Configurable Properties -->
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.xml.catalog.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.catalog.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.catalog.tests.internal.AllTests"/>
- </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.catalog.tests*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.classpath b/tests/org.eclipse.wst.xml.core.tests/.classpath
deleted file mode 100644
index e2bdc16..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.classpath
+++ /dev/null
@@ -1,11 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.cvsignore b/tests/org.eclipse.wst.xml.core.tests/.cvsignore
deleted file mode 100644
index 45bf546..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodelxmltests.jar
-javaCompiler.ssemodelxmltests.jar.args
diff --git a/tests/org.eclipse.wst.xml.core.tests/.project b/tests/org.eclipse.wst.xml.core.tests/.project
deleted file mode 100644
index 89ffba5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.core.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.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.core.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.core.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 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=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-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=error
-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=error
-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=ignore
-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.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.core.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.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-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.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b3022ef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
-Bundle-Version: 1.0.600.qualifier
-Bundle-ClassPath: ssemodelxmltests.jar
-Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal.document.test;x-internal:=true,
- org.eclipse.wst.xml.core.tests,
- org.eclipse.wst.xml.core.tests.cleanup,
- org.eclipse.wst.xml.core.tests.cleanup.testfiles,
- org.eclipse.wst.xml.core.tests.contentmodel,
- org.eclipse.wst.xml.core.tests.document,
- org.eclipse.wst.xml.core.tests.dom,
- org.eclipse.wst.xml.core.tests.format,
- org.eclipse.wst.xml.core.tests.format.testfiles.xml,
- org.eclipse.wst.xml.core.tests.model,
- org.eclipse.wst.xml.core.tests.text,
- org.eclipse.wst.xml.core.tests.text.testfiles.xml,
- org.eclipse.wst.xml.core.tests.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.junit;bundle-version="3.8.2",
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.text,
- org.eclipse.wst.sse.core,
- com.ibm.icu,
- org.eclipse.wst.common.uriresolver
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.xml.core.tests/about.html b/tests/org.eclipse.wst.xml.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.core.tests/build.properties b/tests/org.eclipse.wst.xml.core.tests/build.properties
deleted file mode 100644
index e1f4a55..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.ssemodelxmltests.jar = src/
-output.ssemodelxmltests.jar = bin/
-bin.includes = plugin.xml,\
- ssemodelxmltests.jar,\
- test.xml,\
- testfiles.zip,\
- projecttestfiles/,\
- META-INF/,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.properties b/tests/org.eclipse.wst.xml.core.tests/plugin.properties
deleted file mode 100644
index 5c7eef9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.core.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = SSE Model XML Tests
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.xml b/tests/org.eclipse.wst.xml.core.tests/plugin.xml
deleted file mode 100644
index f476989..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension point="org.eclipse.core.contenttype.contentTypes">
- <!-- associate .fragx files with the XML content type -->
- <file-association
- content-type="org.eclipse.core.runtime.xml"
- file-extensions="fragx" />
- </extension>
-
- <extension
- id="Test"
- point="org.eclipse.core.runtime.applications">
- <application>
- <run
- class="org.eclipse.wst.xml.core.tests.contentmodel.CMVisitorTest" />
- </application>
- </extension>
-
- <extension point="org.eclipse.wst.xml.core.catalogContributions">
- <catalogContribution id="default">
- <uri
- name="http://www.example.org/GlobalCMDocumentCacheTestSchema.xsd"
- uri="projecttestfiles/testfiles/GlobalCMDocumentCacheTestSchema.xsd" />
- </catalogContribution>
- </extension>
-
- <extension
- point="org.eclipse.wst.xml.core.externalSchemaLocations">
- <provider class="org.eclipse.wst.xml.core.tests.contentmodel.ExternalSchemaTest$ExternalSchemaLocationProvider">
- </provider>
- </extension>
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMDocumentCacheTestProject.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMDocumentCacheTestProject.zip
deleted file mode 100644
index 9477dce..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMDocumentCacheTestProject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMValidatorTestProject.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMValidatorTestProject.zip
deleted file mode 100644
index b8de148..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/CMValidatorTestProject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zip
deleted file mode 100644
index 8c28d7c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/attributesordertestfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/cyclicgrouptestfiles.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/cyclicgrouptestfiles.zip
deleted file mode 100644
index 1bece97..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/cyclicgrouptestfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/testfiles/GlobalCMDocumentCacheTestSchema.xsd b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/testfiles/GlobalCMDocumentCacheTestSchema.xsd
deleted file mode 100644
index 6643f7a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/testfiles/GlobalCMDocumentCacheTestSchema.xsd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/GlobalCMDocumentCacheTestSchema" xmlns:tns="http://www.example.org/GlobalCMDocumentCacheTestSchema" elementFormDefault="qualified">
-
- <element name="root" type="string"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
deleted file mode 100644
index 683ad6c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xsiTestProject.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xsiTestProject.zip
deleted file mode 100644
index 70b8fb6..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xsiTestProject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
deleted file mode 100644
index 482de34..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006
- * 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:
- * Balazs Banfai: Bug 154737 getUserData/setUserData support for Node
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=154737
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.core.internal.document.test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.UserDataHandler;
-
-
-public class NodeImplTestCase extends TestCase {
- /**
- * Casts to implementation classes because the interface methods being
- * there isn't the interesting part, just whether our behavior with those
- * methods is correct.
- */
-
- NodeImpl element;
- AttrImpl attribute;
- NodeImpl destinationNode;
- Document document;
-
- Element elementToImport;
-
- private static final String KEY="key";
- private static final String VALUE="value";
- private static final String KEY2="key2";
- private static final String VALUE2="value2";
- private static final boolean DEBUG = false;
-
-
- /**
- * Sets up the test fixture.
- * (Called before every test case method.)
- */
- protected void setUp() {
-
- DOMModelImpl model = new DOMModelImpl();
- document = model.getDocument();
- element = (NodeImpl)document.createElement("testelement");
- attribute = (AttrImpl)document.createAttribute("attribute");
- }
-
- /*
- * Test for null;
- */
- public void testGetUserData0() {
- assertEquals(null, element.getUserData(KEY));
- assertEquals(null, element.getUserData(null));
- }
-
- /*
- * Test for one key/value
- */
- public void testGetUserData1() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE,element.getUserData(KEY));
- assertEquals(null, attribute.getUserData(KEY));
- }
-
- /*
- * Test for multiple nodes
- */
- public void testGetUserData2() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE,element.getUserData(KEY));
- attribute.setUserData(KEY2, VALUE2, null);
- assertEquals(VALUE2,attribute.getUserData(KEY2));
- }
-
- /*
- * Test for multiple keys
- */
- public void testGetUserData3() {
- element.setUserData(KEY, VALUE, null);
- element.setUserData(KEY2, VALUE2, null);
- assertEquals(VALUE,element.getUserData(KEY));
- assertEquals(VALUE2,element.getUserData(KEY2));
- }
-
- /*
- * Test for null key
- */
- public void testSetUserData1() {
- assertEquals(null, element.setUserData(null, VALUE, null));
- }
-
- /*
- * Test for null data with no previous value
- */
- public void testSetUserData2() {
- assertEquals(null, element.setUserData(KEY, null, null));
- }
-
- /*
- * Test for overwriting
- */
- public void testSetUserData3() {
- element.setUserData(KEY, VALUE, null);
- element.setUserData(KEY, VALUE2, null);
- assertEquals(VALUE2, element.getUserData(KEY));
- }
-
- /*
- * Test for deleting
- */
- public void testSetUserData4() {
- element.setUserData(KEY, VALUE, null);
- assertEquals(VALUE, element.getUserData(KEY));
- element.setUserData(KEY, null, null);
- assertEquals(null, element.getUserData(KEY));
- }
-
- /*
- * Test for notifying the UserDataHandler=null
- */
- public void testNotifyUserDataHandler0() {
-
- attribute.setUserData(KEY, VALUE, null);
- destinationNode=(NodeImpl)attribute.cloneNode(true);
- }
-
- /*
- * Test for notifying the UserDataHandler when cloning an attribute
- */
- public void testNotifyUserDataHandler1() {
-
- attribute.setUserData(KEY, VALUE, new UserDataHandler(){
-
- public void handle(short operation, String key, Object data, Node src, Node dst) {
- assertEquals(UserDataHandler.NODE_CLONED, operation);
- assertEquals(VALUE, data);
- assertEquals(KEY, key);
- assertEquals(src, attribute);
-
- if(DEBUG)
- System.out.println("Operation: "+operation+" Key:"+ key
- + " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst.getLocalName());
-
- }
- });
- //event occurs before the destinationNode returns....
- destinationNode=(AttrImpl)attribute.cloneNode(true);
- }
-
- /*
- * Test for notifying the UserDataHandler when importing
- */
- public void testNotifyUserDataHandler2() {
- elementToImport = document.createElement("ElementToImport");
- ((NodeImpl)elementToImport).setUserData(KEY, VALUE, new UserDataHandler(){
-
- public void handle(short operation, String key, Object data, Node src, Node dst) {
-
- //see if NODE.IMPORTED notification occurs with the right
- //parameters
- if (operation==UserDataHandler.NODE_IMPORTED) {
- assertEquals(VALUE, data);
- assertEquals(KEY, key);
- assertEquals(src, elementToImport);
- assertEquals(dst, null);
- if(DEBUG)
- System.out.println("Operation: "+operation+" Key:"+ key
- + " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst);
- }
- }
- });
- document.importNode(elementToImport, true);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
deleted file mode 100644
index d360697..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.xml.core.tests"; //$NON-NLS-1$
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
-
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
-
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
deleted file mode 100644
index e1fd88b..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2012 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.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.document.test.NodeImplTestCase;
-import org.eclipse.wst.xml.core.tests.cache.GlobalCMDocumentCacheTest;
-import org.eclipse.wst.xml.core.tests.cleanup.TestCleanupProcessorXML;
-import org.eclipse.wst.xml.core.tests.contentmodel.CMValidatorValidationTest;
-import org.eclipse.wst.xml.core.tests.contentmodel.ExternalSchemaTest;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestAttributesOrder;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestCatalogRetrivalAndModelCreation;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestCyclicGroupReferences;
-import org.eclipse.wst.xml.core.tests.contentmodel.XSITypeTest;
-import org.eclipse.wst.xml.core.tests.document.FileBufferDocumentTester;
-import org.eclipse.wst.xml.core.tests.document.GetDocumentRegionsTest;
-import org.eclipse.wst.xml.core.tests.document.TestStructuredDocument;
-import org.eclipse.wst.xml.core.tests.document.TestXMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.document.TransitionTests;
-import org.eclipse.wst.xml.core.tests.dom.AttrImplTests;
-import org.eclipse.wst.xml.core.tests.dom.DOMImplementationTests;
-import org.eclipse.wst.xml.core.tests.dom.ElementImplTests;
-import org.eclipse.wst.xml.core.tests.dom.NameValidatorTests;
-import org.eclipse.wst.xml.core.tests.dom.NodeContainerTests;
-import org.eclipse.wst.xml.core.tests.dom.NodeListImplTests;
-import org.eclipse.wst.xml.core.tests.dom.RegionChangedAdapterNotificationTests;
-import org.eclipse.wst.xml.core.tests.format.TestPartitionFormatterXML;
-import org.eclipse.wst.xml.core.tests.model.TestModelManager;
-import org.eclipse.wst.xml.core.tests.model.TestModelsFromFiles;
-import org.eclipse.wst.xml.core.tests.model.TestStructuredModel;
-import org.eclipse.wst.xml.core.tests.model.TestXMLModelLoader;
-import org.eclipse.wst.xml.core.tests.range.TestRangeCompare;
-import org.eclipse.wst.xml.core.tests.text.TestStructuredPartitionerXML;
-
-
-
-public class SSEModelXMLTestSuite extends TestSuite {
- public static Test suite() {
- return new SSEModelXMLTestSuite();
- }
-
- public SSEModelXMLTestSuite() {
- super("XML Core Test Suite");
- addTest(new TestSuite(TestModelsFromFiles.class));
- addTest(new TestSuite(TestXMLModelLoader.class));
- addTest(new TestSuite(TestXMLDocumentLoader.class));
- addTest(new TestSuite(TestStructuredDocument.class));
- addTest(new TestSuite(FileBufferDocumentTester.class));
-
- addTest(new TestSuite(TestModelManager.class));
- addTest(new TestSuite(TestStructuredModel.class));
- addTest(new TestSuite(TestStructuredPartitionerXML.class));
- addTest(new TestSuite(NameValidatorTests.class));
- addTest(new TestSuite(DOMImplementationTests.class));
- addTest(new TestSuite(ElementImplTests.class));
- addTest(new TestSuite(AttrImplTests.class));
- addTest(new TestSuite(NodeListImplTests.class));
- addTest(new TestSuite(NodeContainerTests.class));
- addTest(new TestSuite(TransitionTests.class));
- addTest(new TestSuite(TestRangeCompare.class));
- addTest(new TestSuite(XMLCorePreferencesTest.class));
- addTest(new TestSuite(TestCatalogRetrivalAndModelCreation.class));
- addTest(new TestSuite(XSITypeTest.class));
-
- addTest(new TestSuite(GetDocumentRegionsTest.class));
- addTest(new TestSuite(NodeImplTestCase.class));
-
- addTest(new TestSuite(TestPartitionFormatterXML.class));
- addTest(new TestSuite(TestCleanupProcessorXML.class));
- addTest(new TestSuite(TestAttributesOrder.class));
-
- addTest(new TestSuite(CMValidatorValidationTest.class));
-
- addTest(new TestSuite(RegionChangedAdapterNotificationTests.class));
- addTest(new TestSuite(GlobalCMDocumentCacheTest.class));
- addTest(new TestSuite(ExternalSchemaTest.class));
- addTest(new TestSuite(TestCyclicGroupReferences.class));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
deleted file mode 100644
index 32f1dfa..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSEModelXMLTestsPlugin extends Plugin {
- //The shared instance.
- private static SSEModelXMLTestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public SSEModelXMLTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static SSEModelXMLTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return key;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.xml.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
deleted file mode 100644
index 323201a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class XMLCorePreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.xml.core";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- }
- catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, XMLCorePreferenceNames.INDENTATION_SIZE);
- bundleGetPreference(bundleName, XMLCorePreferenceNames.LINE_WIDTH);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- int defaultValue = -1;
-
- int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
- assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IEclipsePreferences node = new DefaultScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginGetDefaultPreference(node, XMLCorePreferenceNames.SPLIT_MULTI_ATTRS, Boolean.toString(false));
- pluginGetDefaultPreference(node, XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.TAB);
- }
-
- private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String theDefaultValue = node.get(prefKey, defaultValue);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IEclipsePreferences node = new InstanceScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
- pluginSetPreferenceBoolean(node, XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
- pluginSetPreferenceString(node, XMLCorePreferenceNames.INDENTATION_CHAR);
- }
-
- private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
- boolean originalValue = false;
- boolean expectedValue = true;
-
- String originalString = node.get(prefKey, "bogus");
- if (!"bogus".equals(originalString)) {
- originalValue = Boolean.valueOf(originalString).booleanValue();
- expectedValue = !originalValue;
- }
- node.putBoolean(prefKey, expectedValue);
- boolean foundValue = node.getBoolean(prefKey, true);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalString))
- node.remove(prefKey);
- else
- node.put(prefKey, originalString);
- }
-
- private void pluginSetPreferenceString(IEclipsePreferences node, String prefKey) {
- String originalValue = node.get(prefKey, "bogus");
- String expectedValue = Long.toString(System.currentTimeMillis()); // random
- // string
- node.put(prefKey, expectedValue);
- String foundValue = node.get(prefKey, "");
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- if ("bogus".equals(originalValue))
- node.remove(prefKey);
- else
- node.put(prefKey, originalValue);
- }
-
- /**
- * Tests line delimiter preferences by making sure document created
- * follows line delimiter preference.
- */
- public void testDelimiterPreferences() {
- // check if content type preferences match
- String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForXML.ContentTypeID_XML);
- Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForXML.ContentTypeID_XML);
- String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
- assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
- // set a particular line delimiter
- prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
- // create document
- XMLDocumentLoader loader = new XMLDocumentLoader();
- IEncodedDocument document = loader.createNewStructuredDocument();
- String documentDelimiter = document.getPreferredLineDelimiter();
-
- // verify delimiter in document matches preference
- assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
- // return to original preference
- prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cache/GlobalCMDocumentCacheTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cache/GlobalCMDocumentCacheTest.java
deleted file mode 100644
index c3937be..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cache/GlobalCMDocumentCacheTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.tests.cache;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.CMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-import org.w3c.dom.Document;
-
-public class GlobalCMDocumentCacheTest extends TestCase {
-
- private static final String ZIP_FILE_NAME = "CMDocumentCacheTestProject.zip"; //$NON-NLS-1$
- private static final String PROJECT_NAME = "CMDocumentCacheTestProject"; //$NON-NLS-1$
-
- protected void setUp() throws Exception {
- super.setUp();
- Location platformLocation = Platform.getInstanceLocation();
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, ZIP_FILE_NAME, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(PROJECT_NAME);
- }
-
- /*
- * Test description:
- * - Enable global cache.
- * - Schema GlobalCMDocumentCacheTestSchema.xsd is contributed to the system catalog.
- * - Load documents "GlobalCMDocumentCacheTest1.xml" and "GlobalCMDocumentCacheTest1.xml".
- * - Verify that the associated CMDocuments are the same (cached).
- * - Load documents "document1.xml" and "document2.xml" (local schema, not in catalog).
- * - Verify that the associated CMDocuments are different (not cached, as the schema is not in system catalog).
- */
- public void testGlobalCMDocumentCacheEnabled() {
-
- // Ensure the global cache is disabled.
- setGlobalCacheEnabled(true);
-
- // Load "web1.xml" and "web2.xml"
- CMDocument globalCMDocumentCacheTest_1 = getCMDocumentFromXMLFile(PROJECT_NAME + "/GlobalCMDocumentCacheTest1.xml"); //$NON-NLS-1$
- CMDocument globalCMDocumentCacheTest_2 = getCMDocumentFromXMLFile(PROJECT_NAME + "/GlobalCMDocumentCacheTest2.xml"); //$NON-NLS-1$
-
- // Ensure CMDocuments are different.
- assertEquals(globalCMDocumentCacheTest_1, globalCMDocumentCacheTest_2);
-
- // Load "document1.xml" and "document2.xml"
- CMDocument localCMDocument_1 = getCMDocumentFromXMLFile(PROJECT_NAME + "/document1.xml"); //$NON-NLS-1$
- CMDocument localCMDocument_2 = getCMDocumentFromXMLFile(PROJECT_NAME + "/document2.xml"); //$NON-NLS-1$
-
- // Ensure CMDocuments are different.
- assertNotSame(localCMDocument_1, localCMDocument_2);
- }
-
- /*
- * Test description:
- * - Disable global cache.
- * - Schema GlobalCMDocumentCacheTestSchema.xsd is contributed to the system catalog.
- * - Load documents "GlobalCMDocumentCacheTest1.xml" and "GlobalCMDocumentCacheTest1.xml".
- * - Verify that the associated CMDocuments are different (not cached).
- * - Load documents "document1.xml" and "document2.xml". (local schema, not in catalog).
- * - Verify that the associated CMDocuments are different (not cached, as the schema is not in system catalog).
- */
- public void testGlobalCMDocumentCacheDisabled() {
-
- // Ensure the global cache is disabled.
- setGlobalCacheEnabled(false);
-
- // Load "web1.xml" and "web2.xml"
- CMDocument globalCMDocumentCacheTest_1 = getCMDocumentFromXMLFile(PROJECT_NAME + "/GlobalCMDocumentCacheTest1.xml"); //$NON-NLS-1$
- CMDocument globalCMDocumentCacheTest_2 = getCMDocumentFromXMLFile(PROJECT_NAME + "/GlobalCMDocumentCacheTest2.xml"); //$NON-NLS-1$
-
- // Ensure CMDocuments are different.
- assertNotSame(globalCMDocumentCacheTest_1, globalCMDocumentCacheTest_2);
-
- // Load "document1.xml" and "document2.xml"
- CMDocument localCMDocument_1 = getCMDocumentFromXMLFile(PROJECT_NAME + "/document1.xml"); //$NON-NLS-1$
- CMDocument localCMDocument_2 = getCMDocumentFromXMLFile(PROJECT_NAME + "/document2.xml"); //$NON-NLS-1$
-
- // Ensure CMDocuments are different.
- assertNotSame(localCMDocument_1, localCMDocument_2);
-
- }
-
- private CMDocument getCMDocumentFromXMLFile(String documentPath) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(documentPath));
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel structuredModel = null;
- CMDocument cmDocument = null;
- try {
- structuredModel = modelManager.getModelForRead(file);
- Document document = ((IDOMModel) structuredModel).getDocument();
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
- CMDocumentManager cmDocumentManager = modelQuery.getCMDocumentManager();
- CMDocumentLoader loader = new CMDocumentLoader(document, cmDocumentManager);
- loader.loadCMDocuments();
- cmDocument = modelQuery.getCorrespondingCMDocument(document.getDocumentElement());
- } catch (Exception exception) {exception.printStackTrace();}
- finally {
- if (structuredModel != null) {
- structuredModel.releaseFromRead();
- }
- }
- return cmDocument;
- }
-
- private void setGlobalCacheEnabled(boolean value) {
- Preferences pluginPreferences = XMLCorePlugin.getDefault().getPluginPreferences();
- pluginPreferences.setDefault(XMLCorePreferenceNames.CMDOCUMENT_GLOBAL_CACHE_ENABLED, value);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/TestCleanupProcessorXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/TestCleanupProcessorXML.java
deleted file mode 100644
index f148f52..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/TestCleanupProcessorXML.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.tests.cleanup;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-
-public class TestCleanupProcessorXML extends TestCase {
-
- private CleanupProcessorXML cleanup;
- protected void setUp() throws Exception {
- cleanup = new CleanupProcessorXML();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestCleanupProcessorXML)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- public void testCleanupNoHeader() {
- String path = "testfiles/noheader.xml";
- IStructuredModel model = null;
- try {
- model = getModelForEdit(path);
- assertNotNull("Could not load model for [" + path + "]", model);
-
- cleanup.getCleanupPreferences().setFormatSource(false);
- cleanup.cleanupModel(model);
-
- IndexedRegion region = model.getIndexedRegion(0);
- assertTrue("First region is not a node", region instanceof Node);
-
- Node node = (Node) region;
- assertTrue("First region is not a processing instruction", node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE);
-
- ProcessingInstruction pi = (ProcessingInstruction) node;
- assertEquals("Node is not an XML declaration", "xml", pi.getTarget());
- String encoding = XMLCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
- assertEquals("version=\"1.0\" encoding=\"" + encoding + "\"", pi.getData());
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCleanupFixDeclaration() {
- String path = "testfiles/fixdecl.xml";
- IStructuredModel model = null;
- try {
- model = getModelForEdit(path);
- assertNotNull("Could not load model for [" + path + "]", model);
-
- cleanup.getCleanupPreferences().setFormatSource(false);
- cleanup.cleanupModel(model);
-
- IndexedRegion region = model.getIndexedRegion(0);
- assertTrue("First region is not a node", region instanceof Node);
-
- Node node = (Node) region;
- assertTrue("First region is not a processing instruction", node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE);
-
- ProcessingInstruction pi = (ProcessingInstruction) node;
- assertEquals("Node is not an XML declaration", "xml", pi.getTarget());
- assertEquals("version=\"1.0\" encoding=\"ISO-8859-1\"", pi.getData());
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/fixdecl.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/fixdecl.xml
deleted file mode 100644
index 193fb4e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/fixdecl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<root>
- <node id="content"></node>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/noheader.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/noheader.xml
deleted file mode 100644
index df28816..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/cleanup/testfiles/noheader.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<root>
- <data id="1"></data>
- <data id="2"></data>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
deleted file mode 100644
index 41bff4c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMPrinter extends CMVisitor
-{
- protected StringBuffer fStringBuffer = new StringBuffer();
- protected Vector visitedElements = new Vector();
-
- /****** formatting ******/
- protected String indent = ""; //$NON-NLS-1$
-
- protected void incrementIndent()
- {
- indent = indent + " "; //$NON-NLS-1$
- }
-
- protected void decrementIndent()
- {
- indent = indent.substring(0, indent.length()-2);
- }
-
-
- public void printCMNode(String filename, CMNode cmnode)
- {
- visitCMNode(cmnode);
- try
- {
- FileOutputStream fileStream = new FileOutputStream(filename);
- OutputStreamWriter writer = new OutputStreamWriter(fileStream);
- writer.write(fStringBuffer.toString());
- writer.flush();
- fileStream.close();
- }
- catch (IOException e) {
- Logger.logException("PMPrinter Debug: ", e);
- }
- }
-
- public void visitCMAnyElement(CMAnyElement anyElement)
- {
- fStringBuffer.append(indent + "<CMAnyElement"); //$NON-NLS-1$
- printAttributes(fStringBuffer, anyElement);
- fStringBuffer.append(">/n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, anyElement);
- decrementIndent();
- fStringBuffer.append(indent + "</CMAnyElement>/n"); //$NON-NLS-1$
- }
-
- public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
- {
- fStringBuffer.append(indent + "<CMAttributeDeclaration"); //$NON-NLS-1$
- printAttributes(fStringBuffer, ad);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, ad);
- decrementIndent();
- visitCMNode(ad.getAttrType());
- fStringBuffer.append(indent + "</CMAttributeDeclaration>\n"); //$NON-NLS-1$
- }
-
- public void visitCMDataType(CMDataType dataType)
- {
- fStringBuffer.append(indent + "<CMDataType"); //$NON-NLS-1$
- printAttributes(fStringBuffer, dataType);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- fStringBuffer.append(indent + "<ImpliedValue kind=\"" + dataType.getImpliedValueKind() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
- fStringBuffer.append(dataType.getImpliedValue() + "</ImpliedValue>\n"); //$NON-NLS-1$
- printEnumeration(fStringBuffer, dataType.getEnumeratedValues());
- decrementIndent();
- fStringBuffer.append(indent + "</CMDataType>\n"); //$NON-NLS-1$
- }
-
- public void visitCMDocument(CMDocument document)
- {
- fStringBuffer.append(indent + "<CMDocument"); //$NON-NLS-1$
- printAttributes(fStringBuffer, document);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
-
- // printEntities(sb, document.getEntities());
- printProperties(fStringBuffer, document);
-
- CMNamedNodeMap map = document.getElements();
- int size = map.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(map.item(i));
- }
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMDocument>\n"); //$NON-NLS-1$
- }
-
- public void visitCMGroup(CMGroup group)
- {
- fStringBuffer.append(indent + "<CMGroup"); //$NON-NLS-1$
- printAttributes(fStringBuffer, group);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
-
- CMNodeList nodeList = group.getChildNodes();
- int size = nodeList.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(nodeList.item(i));
- }
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMGroup>\n"); //$NON-NLS-1$
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration ed)
- {
- if (!visitedElements.contains(ed))
- {
- visitedElements.add(ed);
- fStringBuffer.append(indent + "<CMElementDeclaration"); //$NON-NLS-1$
- printAttributes(fStringBuffer, ed);
- fStringBuffer.append(">\n"); //$NON-NLS-1$
- incrementIndent();
- printProperties(fStringBuffer, ed);
-
- CMNamedNodeMap nodeMap = ed.getAttributes();
- int size = nodeMap.getLength();
- for (int i = 0; i < size; i++)
- {
- visitCMNode(nodeMap.item(i));
- }
-
- visitCMNode(ed.getContent());
-
- CMDataType dataType = ed.getDataType();
- if (dataType != null)
- visitCMNode(dataType);
-
- decrementIndent();
- fStringBuffer.append(indent + "</CMElementDeclaration>\n"); //$NON-NLS-1$
- }
- }
-
-
- public void printEnumeration(StringBuffer sb, String[] values)
- {
- if ((values != null) && (values.length > 0))
- {
- sb.append(indent + "<Enumeration>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (int i=0; i<values.length; i++)
- {
- sb.append(indent + "<Value>" + values[i] + "</Values>\n"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- decrementIndent();
- sb.append(indent + "</Enumeration>\n"); //$NON-NLS-1$
- }
- }
-
-
- public void printAttributes(StringBuffer sb, CMNode cmnode)
- {
- if (cmnode != null)
- {
- sb.append(" nodeName=\"" + cmnode.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" nodeType=\"" + cmnode.getNodeType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (cmnode instanceof CMContent)
- {
- sb.append(" minOccur=\"" + ((CMContent)cmnode).getMinOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" maxOccur=\"" + ((CMContent)cmnode).getMaxOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMAnyElement)
- {
- sb.append(" namespaceURI=\"" + ((CMAnyElement)cmnode).getNamespaceURI() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMAttributeDeclaration)
- {
- sb.append(" uasage=\"" + ((CMAttributeDeclaration)cmnode).getUsage() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- sb.append(" defaultValue=\"" + ((CMAttributeDeclaration)cmnode).getDefaultValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMDataType)
- {
- sb.append(" instanceValue=\"" + ((CMDataType)cmnode).generateInstanceValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMEntityDeclaration)
- {
- String value = ((CMEntityDeclaration)cmnode).getValue();
- if (value.indexOf("\"") == -1) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- else sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMGroup)
- {
- sb.append(" operator=\"" + ((CMGroup)cmnode).getOperator() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (cmnode instanceof CMElementDeclaration)
- {
- sb.append(" contentType=\"" + ((CMElementDeclaration)cmnode).getContentType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
-
-
- public void printEntities(StringBuffer sb, CMNamedNodeMap entities)
- {
- if ((entities != null) && (entities.getLength()>0))
- {
- sb.append(indent + "<Entities>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (Iterator i = entities.iterator(); i.hasNext();)
- {
- CMEntityDeclaration entity = (CMEntityDeclaration)i.next();
- sb.append(indent + "<Entity"); //$NON-NLS-1$
- printAttributes(sb, entity);
- sb.append("/>\n"); //$NON-NLS-1$
- }
-
- decrementIndent();
- sb.append(indent + "</Entities>\n"); //$NON-NLS-1$
- }
- }
-
- public void printProperties(StringBuffer sb, CMNode cmnode)
- {
- List properties = getProperties(cmnode);
- sb.append(indent + "<Properties>\n"); //$NON-NLS-1$
- incrementIndent();
-
- for (int i=0; i<properties.size(); i++)
- {
- String property = (String)properties.get(i);
- sb.append(indent + "<Property name=\"" + property + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (cmnode.supports(property))
- {
- sb.append(" supports=\"true\""); //$NON-NLS-1$
- }
- else
- {
- sb.append(" supports=\"false\""); //$NON-NLS-1$
- }
- Object value = cmnode.getProperty(property);
- if (value instanceof String) sb.append(" value=\"" + (String)value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else if (value instanceof Boolean) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else if (value != null) sb.append(" value=\"" + value.getClass() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- else sb.append(" value=\"null\""); //$NON-NLS-1$
- sb.append("/>\n"); //$NON-NLS-1$
- }
-
- decrementIndent();
- sb.append(indent + "</Properties>\n"); //$NON-NLS-1$
- }
-
- public List getProperties(CMNode cmnode)
- {
- List properties = new Vector();
-
- if (cmnode != null)
- {
- properties.add("CMDocument"); //$NON-NLS-1$
- properties.add("documentation"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/usesLocalElementDeclarations"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/isNameSpaceAware"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/nsPrefixQualification"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/nillable"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/mofNotifier"); //$NON-NLS-1$
- properties.add("spec"); //$NON-NLS-1$
-
- if (cmnode instanceof CMElementDeclaration)
- {
- properties.add("http://org.eclipse.wst/cm/properties/definitionInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/definition"); //$NON-NLS-1$
- properties.add("XSITypes"); //$NON-NLS-1$
- properties.add("DerivedElementDeclaration"); //$NON-NLS-1$
- // properties.add("SubstitutionGroup"); Currrently broken for nexted xsd files
- properties.add("Abstract"); //$NON-NLS-1$
- }
- if (cmnode instanceof CMDocument)
- {
- properties.add("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/importedNamespaceInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/namespaceInfo"); //$NON-NLS-1$
- properties.add("http://org.eclipse.wst/cm/properties/elementFormDefault"); //$NON-NLS-1$
- properties.add("annotationMap"); //$NON-NLS-1$
- }
- }
- return properties;
- }
-
-}
-
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
deleted file mode 100644
index 98e669d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMUtility
-{
- /**
- * return true if the child or any of its ancestor group nodes are repeatable
- */
- public static boolean isNodeOrAncestorGroupRepeatable(CMContent content, CMNode child)
- {
- // since we can't walk up the CMNode tree (why you ask? ... its a long story)
- // we walk down the tree to consider the child's parent node's
- //
- boolean result = isRepeatable(child);
- if (!result)
- {
- CanRepeatVisitor visitor = new CanRepeatVisitor(content, child);
- visitor.visitCMNode(content);
- result = visitor.getResult();
- }
- return result;
- }
-
- /**
- * return true if the child is repeatable
- */
- public static boolean isNodeRepeatable(CMContent content, CMNode child)
- {
- // since we can't walk up the CMNode tree (why you ask? ... its a long story)
- // we walk down the tree to consider the child's parent node's
- //
- boolean result = isRepeatable(child);
- if (!result)
- {
- IsRepeatableVisitor visitor = new IsRepeatableVisitor(content, child);
- visitor.visitCMNode(content);
- result = visitor.getResult();
- }
- return result;
- }
-
- public static boolean isRepeatable(CMNode child)
- {
- boolean result = false;
- if (child instanceof CMContent)
- {
- CMContent content = (CMContent)child;
- result = content.getMaxOccur() > 1 || content.getMaxOccur() == -1;
- }
- return result;
- }
-
-
- protected static class CanRepeatVisitor extends CMVisitor
- {
- public boolean result;
- protected boolean isWithinRepeatableGroup;
-
- protected CMNode root;
- protected CMNode target;
-
- public CanRepeatVisitor(CMNode root, CMNode target)
- {
- this.root = root;
- this.target = target;
- }
-
- public void visitCMGroup(CMGroup group)
- {
- boolean oldIsWithinRepeatableGroup = isWithinRepeatableGroup;
-
- isWithinRepeatableGroup = isRepeatable(group);
-
- super.visitCMGroup(group);
-
- isWithinRepeatableGroup = oldIsWithinRepeatableGroup;
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration cmelement)
- {
- if (cmelement == target)
- {
- result = isWithinRepeatableGroup;
- }
- }
-
- public boolean getResult()
- {
- return result;
- }
- }
-
-
- protected static class IsRepeatableVisitor extends CMVisitor
- {
- public boolean result = false;
- protected CMGroup currentGroup;
-
- protected CMNode root;
- protected CMNode target;
-
- public IsRepeatableVisitor(CMNode root, CMNode target)
- {
- this.root = root;
- this.target = target;
- }
-
- public void visitCMGroup(CMGroup group)
- {
- CMGroup previousGroup = currentGroup;
- currentGroup = group;
- super.visitCMGroup(group);
- currentGroup = previousGroup;
- }
-
- public void visitCMElementDeclaration(CMElementDeclaration cmelement)
- {
- if (cmelement == target)
- {
- if (currentGroup != null)
- {
- result = ((currentGroup.getOperator() == CMGroup.CHOICE) &&
- (isRepeatable(currentGroup)));
- }
- }
- }
-
- public boolean getResult()
- {
- return result;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
deleted file mode 100644
index f52cc18..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.ElementPathRecordingResult;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.StringElementContentComparator;
-
-public class CMValidatorTest
-{
- public static void main(String arg[])
- {
- if (arg.length > 1)
- {
- try
- {
- //CMDocumentFactoryRegistry.getInstance().registerCMDocumentBuilderWithClassName("org.eclipse.wst.xml.core.internal.contentmodel.mofimpl.CMDocumentBuilderImpl");
-
- String grammarFileName = arg[0];
- String elementName = arg[1];
-
- CMDocument cmDocument = ContentModelManager.getInstance().createCMDocument(grammarFileName, null);
-
- CMNamedNodeMap elementMap = cmDocument.getElements();
- CMElementDeclaration element = (CMElementDeclaration)elementMap.getNamedItem(elementName);
- if (element != null)
- { /*
- println("found element [" + elementName + "] contentType = " + element.getContentType());
- GraphNode graphNode = createGraph(element);
- printGraph(graphNode);
- */
- println("-------------- begin validate ---------------"); //$NON-NLS-1$
-
- StringElementContentComparator comparator = new StringElementContentComparator();
- CMValidator validator = new CMValidator();
- ElementPathRecordingResult result = new ElementPathRecordingResult();
- validator.getOriginArray(element, CMValidator.createStringList(arg, 2), comparator, result);
- if (result.isValid)
- {
- CMNode[] nodeMapping = result.getOriginArray();
- println("Validation Success!"); //$NON-NLS-1$
- print(" "); //$NON-NLS-1$
- for (int i = 0; i < nodeMapping.length; i++)
- {
- String name = nodeMapping[i] != null ? nodeMapping[i].getNodeName() : "null"; //$NON-NLS-1$
- print("[" + name + "]"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- println(""); //$NON-NLS-1$
- }
- else
- {
- println("Validation Failed! "); //$NON-NLS-1$
- if (result.errorMessage != null)
- {
- println(" " + result.errorMessage); //$NON-NLS-1$
- }
- }
- println("-------------- end validate ---------------"); //$NON-NLS-1$
- }
- else
- {
- println("element [" + elementName + "] can not be found"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- catch (Exception e)
- {
- println("CMValidator error"); //$NON-NLS-1$
- e.printStackTrace();
- }
- }
- else
- {
- println("2 args required... only " + arg.length + " provided"); //$NON-NLS-1$ //$NON-NLS-2$
- println("usage java org.eclipse.wst.newxml.util.XMLUtil grammarFileName rootElementName pattern"); //$NON-NLS-1$
- }
- }
-
- public static void print(String string)
- {
- }
-
- public static void println(String string)
- {
- }
-
- public static void printlnIndented(int indent, String string)
- {
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorValidationTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorValidationTest.java
deleted file mode 100644
index d37c036..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorValidationTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.tests.contentmodel;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class CMValidatorValidationTest extends TestCase {
-
- private final String PROJECT_NAME ="CMValidatorTestProject";
- private final String ZIP_FILE_NAME = "CMValidatorTestProject.zip";
-
- protected void setUp() throws Exception {
- Location platformLocation = Platform.getInstanceLocation();
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, ZIP_FILE_NAME, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(PROJECT_NAME);
- }
-
- /*
- * This test makes use of the following XML schema structure:
- *
- * root (element)
- * |
- * +- sequence
- * |
- * +- a (element)
- * | |
- * | +- sequence (0 to n)
- * | |
- * | +- a1 (element)
- * |
- * +- b (element)
- * | |
- * | +- sequence
- * | |
- * | +- b1 (element with occurrences 0 to 2)
- * |
- * +- choice
- * |
- * +- c (element)
- * |
- * +- d (element)
- *
- * Test document contains only the root element.
- * At the root element level, element a is initially available.
- * Adding a makes b available. Adding b makes c or d available.
- * Adding either c or d makes no nodes available at the root.
- * Any arbitrary number of elements a1 can be added to element a.
- * Only 2 elements b2 may be added to element b.
- */
-
- public void testGetInsertActions() {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(PROJECT_NAME + "/CMValidatorTestSchema.xml"));
- IModelManager modelManager = StructuredModelManager.getModelManager();
- try {
- IStructuredModel model = modelManager.getModelForRead(file);
- Document document = ((IDOMModel) model).getDocument();
- Element documentElement = document.getDocumentElement();
-
- // root element has no children, element a should be available
- verify(documentElement, new String[]{"a"});
-
- // add element a
- Element aElement = document.createElement("a");
- documentElement.appendChild(aElement);
-
- // root element contains a; b should be available
- verify(documentElement, new String[]{"b"});
-
- // add element b
- Element bElement = document.createElement("b");
- documentElement.appendChild(bElement);
-
- // root element contains a and b; c and d should be available
- verify(documentElement, new String[]{"d", "c"});
-
- // add element c
- Element cElement = document.createElement("c");
- documentElement.appendChild(cElement);
-
- // root element contains a, b and c; no more elements should be available
- verify(documentElement, new String[]{});
-
- // remove c element
- documentElement.removeChild(cElement);
-
- // root element contains a and b; c and d should be available
- verify(documentElement, new String[]{"d", "c"});
-
- // add element d
- Element dElement = document.createElement("d");
- documentElement.appendChild(dElement);
-
- // root element contains a, b and d; no more elements should be available
- verify(documentElement, new String[]{});
-
- // element a contains no children; element a1 should be available
- verify(aElement, new String[]{"a1"});
-
- // add element a1 to a
- aElement.appendChild(document.createElement("a1"));
-
- // element a1 is in an unbounded sequence, it should still be available
- verify(aElement, new String[]{"a1"});
-
- // element b contains no children; element b1 should be available
- verify(bElement, new String[]{"b1"});
-
- // add element b1 to b
- bElement.appendChild(document.createElement("b1"));
-
- // element b contains 1 b1 child; another instance of b1 should be available
- verify(bElement, new String[]{"b1"});
-
- // add another element b1 to b
- bElement.appendChild(document.createElement("b1"));
-
- // b1 can only appear twice, no elements should be available
- verify(bElement, new String[]{});
-
-
- } catch (Exception exception) {exception.printStackTrace();}
- }
-
-
- private void verify(Element parentElement, String[] childElementsAvailable) {
- List list = new ArrayList();
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(parentElement.getOwnerDocument());
- CMElementDeclaration cmElementDeclaration = modelQuery.getCMElementDeclaration(parentElement);
- modelQuery.getInsertActions(parentElement, cmElementDeclaration, -1, ModelQuery.INCLUDE_CHILD_NODES, ModelQuery.VALIDITY_STRICT, list);
- assertEquals(childElementsAvailable.length, list.size());
- List availableNodeNameList = new ArrayList();
- Iterator iterator = list.iterator();
- while(iterator.hasNext()) {
- availableNodeNameList.add(((ModelQueryAction)iterator.next()).getCMNode().getNodeName());
- }
- for (int i = 0; i < childElementsAvailable.length; i++) {
- if(availableNodeNameList.indexOf(childElementsAvailable[i]) == -1) {
- fail();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
deleted file mode 100644
index 579b990..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 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.tests.contentmodel;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class CMVisitorTest implements IPlatformRunnable {
- public Object run(Object a) {
- String args[] = (String[]) a;
- if (args.length > 0) {
- test(args[0]);
- }
- else {
- System.out.println("xml file name argument required"); //$NON-NLS-1$
- }
- return null;
- }
-
- protected void test(String fileName) {
-
- ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
- try {
- XMLAssociationProvider provider = new XMLAssociationProvider(new CMDocumentCache()) {
- };
-
- ModelQuery mq = new ModelQueryImpl(provider);
-
- Thread.currentThread().setContextClassLoader(CMVisitorTest.class.getClassLoader());
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document document = builder.parse(fileName);
-
- /*
- * ClassLoader prevClassLoader =
- * Thread.currentThread().getContextClassLoader();
- * Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- * Class theClass =
- * Class.forName("org.apache.xerces.parsers.DOMParser"); DOMParser
- * parser = (DOMParser)theClass.newInstance();
- * Thread.currentThread().setContextClassLoader(prevClassLoader);
- * parser.parse(new InputSource(fileName)); Document document =
- * parser.getDocument();
- */
- visitNode(document, mq, 0);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- Thread.currentThread().setContextClassLoader(originalClassLoader);
- }
- }
-
- protected void visitNode(Node node, ModelQuery mq, int indent) {
- CMNode cmnode = mq.getCMNode(node);
- printlnIndented(indent, "node :" + node.getNodeName() + " cmnode : " + (cmnode != null ? cmnode.getNodeName() : "null")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- NamedNodeMap map = node.getAttributes();
- if (map != null) {
- indent += 2;
- int mapLength = map.getLength();
- for (int i = 0; i < mapLength; i++) {
- visitNode(map.item(i), mq, indent);
- }
- indent -= 2;
- }
- indent += 4;
- NodeList list = node.getChildNodes();
- int listLength = list.getLength();
- for (int i = 0; i < listLength; i++) {
- visitNode(list.item(i), mq, indent);
- }
- indent -= 4;
- }
-
- public static void printlnIndented(int indent, String string) {
- for (int i = 0; i < indent; i++) {
- System.out.print(" "); //$NON-NLS-1$
- }
- System.out.println(string);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/ExternalSchemaTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/ExternalSchemaTest.java
deleted file mode 100644
index 0226eb5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/ExternalSchemaTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.tests.contentmodel;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.IExternalSchemaLocationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ExternalSchemaLocationProviderRegistry;
-
-public class ExternalSchemaTest extends TestCase {
-
- private static final String EXTERNAL_SCHEMA_LOCATION = "file://external/schema/foo.xsd";
-
- public static class ExternalSchemaLocationProvider implements org.eclipse.wst.xml.core.contentmodel.modelquery.IExternalSchemaLocationProvider {
- private static URI INTERESTED_RESOURCE = null;
- public ExternalSchemaLocationProvider() {
-
- try {
- INTERESTED_RESOURCE = new URI("file://interested/path/file.xml");
- } catch (Exception e) {}
- }
-
- public Map getExternalSchemaLocation(URI fileURI) {
- Map map = new HashMap(1);
- if (fileURI != null && fileURI.equals(INTERESTED_RESOURCE)) {
- map.put(NO_NAMESPACE_SCHEMA_LOCATION, EXTERNAL_SCHEMA_LOCATION);
- }
- return map;
- }
- }
-
- public void testExternalLocations() throws Exception {
- final IExternalSchemaLocationProvider[] providers = ExternalSchemaLocationProviderRegistry.getInstance().getProviders();
- assertTrue(providers.length > 0);
- URI resource = new URI("file://uninterested/path/file.xml");
- for (int i = 0; i < providers.length; i++) {
- Map locations = providers[i].getExternalSchemaLocation(resource);
- assertTrue("[" + resource + "] should have no external schemas.", locations == null || locations.isEmpty());
- }
-
- resource = new URI("file://interested/path/file.xml");
- boolean foundCorrectSchema = false;
- for (int i = 0; i < providers.length; i++) {
- Map locations = providers[i].getExternalSchemaLocation(resource);
- if (locations != null) {
- String location = (String) locations.get(IExternalSchemaLocationProvider.NO_NAMESPACE_SCHEMA_LOCATION);
- if (EXTERNAL_SCHEMA_LOCATION.equals(location)) {
- foundCorrectSchema = true;
- }
- }
- assertTrue("[" + resource + "] should have an external schema.", foundCorrectSchema);
- }
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
deleted file mode 100644
index 21698de..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestAttributesOrder.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- * David Carver - STAR - Added content Assist check in testIgnoresAttributesOrder
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-/**
- * Tests to ensure that the attributes order is not important when trying to
- * determine the content model.
- *
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=198807
- */
-public class TestAttributesOrder extends TestCase
-{
- private boolean isSetup = false;
-
- /**
- * The target project name.
- */
- private final String fProjectName = "AttributesOrder"; //$NON-NLS-N$
-
- /**
- * The name of the zip file containing the project to import.
- */
- private final String fZipFileName = "attributesordertestfiles.zip"; //$NON-NLS-1$
-
- public TestAttributesOrder()
- {
- super("TestAttributesOrder");
- }
-
- /**
- * Test used to make sure that the attributes order is not important when
- * determining the content model for a given XML document.
- */
- public void testIgnoresAttributesOrder() throws IOException, CoreException
- {
- // Tests the scenario that used to succeed, where the namespace prefix is
- // declared before the schemaLocation.
-
- IFile file = getFile("PreviouslySucceedingTest.xml"); //$NON-NLS-1$
- ensureDocumentHasGrammar(file);
-
- // Tests the failing scenario, where the schemaLocation comes first.
-
- file = getFile("PreviouslyFailingTest.xml"); //$NON-NLS-1$
- ensureDocumentHasGrammar(file);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
-
- if (!this.isSetup)
- {
- doSetup();
- this.isSetup = true;
- }
- }
-
- /**
- * Sets up the required project in the workspace.
- *
- * @throws Exception
- */
- private void doSetup() throws Exception
- {
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- URL platformLocationURL = platformLocation.getURL();
- String file = platformLocationURL.getFile();
- unzipUtil.unzipAndImport(zipFile, file);
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * Reusable test to make sure the XML model for the given file has a grammar.
- *
- * @param file
- * the file containing the XML document.
- */
- private void ensureDocumentHasGrammar(IFile file) throws IOException, CoreException
- {
- IStructuredModel model = null;
- try
- {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- model = modelManager.getModelForRead(file);
- assertNotNull("failure loading model", model); //$NON-NLS-1$
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
- assertNotNull("failure getting document", document); //$NON-NLS-1$
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
- assertNotNull("ModelQuery is missing", modelQuery); //$NON-NLS-1$
- IDOMElement documentElement = (IDOMElement) document.getDocumentElement();
- assertNotNull("missing document element", documentElement); //$NON-NLS-1$
- CMElementDeclaration cmElementDeclaration = modelQuery.getCMElementDeclaration(documentElement);
- assertNotNull("No element declaration for" + documentElement.getNodeName() + " ("+documentElement.getNamespaceURI()+")", cmElementDeclaration); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- assertNotNull("No content assist available for" + documentElement.getNodeName() + " (" + documentElement.getNamespaceURI() + ")",modelQuery.getAvailableContent(documentElement, cmElementDeclaration, ModelQuery.INCLUDE_CHILD_NODES));
- }
- finally
- {
- if (model != null)
- {
- model.releaseFromRead();
- }
- }
- }
-
- /**
- * Utility to retrieve the IFile for the given file name. The file is expected
- * to be in the workspace in the project named by {@link #fProjectName}.
- *
- * @param fileName
- * the name of the file to retrieve.
- * @return an IFile.
- */
- private IFile getFile(String fileName)
- {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- Path path = new Path(fProjectName + "/" + fileName); //$NON-NLS-1$
- return root.getFile(path);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
deleted file mode 100644
index d7a9b1b..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 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
- * Jesper Steen Moeller - Added XML Catalogs 1.1 support
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.IDelegateCatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.IRewriteEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ISuffixEntry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-
-public class TestCatalogRetrivalAndModelCreation extends TestCase {
-
- /**
- * Test that a known error case returns null.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testKnownNotExist() throws MalformedURLException, IOException {
- String JUNK_STRING = "doesNotExistTest";
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(JUNK_STRING, null);
- assertNull("expected no match for " + JUNK_STRING, resolved);
- }
-
- public void removedtestWAPFORUM() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD WML 1.1//EN");
- }
-
- public void testXHTML10() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Strict//EN");
- }
-
- public void testXHTML10T() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Transitional//EN");
- }
-
- public void testXHTML10F() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.0 Frameset//EN");
- }
-
- public void testXHTML10B() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML Basic 1.0//EN");
- }
-
- public void testXHTML11() throws MalformedURLException, IOException {
- doTest("-//W3C//DTD XHTML 1.1//EN");
- }
-
- /**
- * We expect the XMLCatalogResolver and XMLCatalogIdResolver
- * to resolve to the same URI given a public id in our catalog.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testXHTML11_xmlresolver() throws MalformedURLException, IOException {
- String EXPECTED_PUBLICID = "-//W3C//DTD XHTML 1.1//EN";
-
- // bug 117424, here ewe make up a base location to satisfy the resolver API
- // that expects a non-null base location
- String baseLocation = "http://www.example.org/testXHTML11.xml";
- XMLCatalogIdResolver resolver = new XMLCatalogIdResolver(baseLocation, null);
- String resolvedXML_Id = resolver.resolve(baseLocation, EXPECTED_PUBLICID, null);
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolvedXL_Cat = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- assertEquals(resolvedXL_Cat, resolvedXML_Id);
- }
-
- public void testCMXHTML11() throws MalformedURLException, IOException {
- doCMTest("-//W3C//DTD XHTML 1.1//EN");
- }
- public void removedtestXHTML10M() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD XHTML Mobile 1.0//EN");
- }
-
- public void removedtestWAP13() throws MalformedURLException, IOException {
- doTest("-//WAPFORUM//DTD WML 1.3//EN");
- }
-
- public void test2001Schema() throws MalformedURLException, IOException {
- doURITest("http://www.w3.org/2001/XMLSchema");
- }
-
- /**
- * Tests if dtd NOT in our catalog can have a content model
- * created.
- *
- * @throws MalformedURLException
- * @throws IOException
- */
- public void testExternalDTD() throws MalformedURLException, IOException {
- doCM_directURITest("http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd");
- }
-
- public void test2001SchemaCMDirect() throws MalformedURLException, IOException {
- doCM_directURITest("http://www.w3.org/2001/XMLSchema.xsd");
- }
-
- public void test2001SchemaCMCatalog() throws MalformedURLException, IOException {
- doURI_CMTest("http://www.w3.org/2001/XMLSchema");
- }
-
- public void testInvoiceRemote() throws MalformedURLException, IOException {
- doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd", 18);
- }
-
- public void testInvoiceRemoteIndirect() throws MalformedURLException, IOException {
- doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd", 18);
- }
- public final static String LOCAL_SCHEMA_FILE = "file:///usr/tmp/mySchemaSchema.xsd";
- public final static String LOCAL_SCHEMA_DIR = "file:///usr/tmp/schemas/";
- public final static String LOCAL_SCHEMA_DIR_REWRITTEN = "file:///usr/tmp/schemas/example.dtd";
-
- public void testCatalog11SystemSuffix() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- ISuffixEntry systemSuffix = (ISuffixEntry)xmlCatalog.createCatalogElement(ISuffixEntry.SUFFIX_TYPE_SYSTEM);
- systemSuffix.setSuffix("XMLSchema.xsd");
- systemSuffix.setURI(LOCAL_SCHEMA_FILE);
- xmlCatalog.addCatalogElement(systemSuffix);
- try {
- String resolved = xmlCatalog.resolveSystem("http://www.w3.org/2001/XMLSchema.xsd");
- assertEquals(LOCAL_SCHEMA_FILE, resolved);
- } finally {
- xmlCatalog.removeCatalogElement(systemSuffix);
- }
- }
-
- public void testCatalog11UriSuffix() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- ISuffixEntry uriSuffix = (ISuffixEntry)xmlCatalog.createCatalogElement(ISuffixEntry.SUFFIX_TYPE_URI);
- uriSuffix.setSuffix("XMLSchema.xsd");
- uriSuffix.setURI(LOCAL_SCHEMA_FILE);
- xmlCatalog.addCatalogElement(uriSuffix);
- try {
- String resolved = xmlCatalog.resolveURI("http://www.w3.org/2001/XMLSchema.xsd");
- assertEquals(LOCAL_SCHEMA_FILE, resolved);
- } finally {
- xmlCatalog.removeCatalogElement(uriSuffix);
- }
- }
-
- public void testCatalog11RewriteSystem() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- IRewriteEntry systemSuffix = (IRewriteEntry)xmlCatalog.createCatalogElement(IRewriteEntry.REWRITE_TYPE_SYSTEM);
- systemSuffix.setStartString("http://www.example.org/dtds/");
- systemSuffix.setRewritePrefix(LOCAL_SCHEMA_DIR);
- xmlCatalog.addCatalogElement(systemSuffix);
- try {
- String resolved = xmlCatalog.resolveSystem("http://www.example.org/dtds/example.dtd");
- assertEquals(LOCAL_SCHEMA_DIR_REWRITTEN, resolved);
- } finally {
- xmlCatalog.removeCatalogElement(systemSuffix);
- }
- }
-
- public void testCatalog11RewriteUri() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- IRewriteEntry uriSuffix = (IRewriteEntry)xmlCatalog.createCatalogElement(IRewriteEntry.REWRITE_TYPE_URI);
- uriSuffix.setStartString("urn:fisk:");
- uriSuffix.setRewritePrefix(LOCAL_SCHEMA_DIR);
- xmlCatalog.addCatalogElement(uriSuffix);
- try {
- String resolved = xmlCatalog.resolveURI("urn:fisk:example.dtd");
- assertEquals(LOCAL_SCHEMA_DIR_REWRITTEN, resolved);
- } finally {
- xmlCatalog.removeCatalogElement(uriSuffix);
- }
- }
-
- public void testCatalog11DelegatePublic() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- IDelegateCatalog publicDelegate = (IDelegateCatalog)xmlCatalog.createCatalogElement(IDelegateCatalog.DELEGATE_TYPE_PUBLIC);
-
- // Ironically, we don't use WTP's Resolver when loading the catalog XML.
- // Adding <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.1//EN" "http://www.example.org/dtd/catalog.dtd">
- // to the catalog below will make the loading fail...
-
- File delegateCat = makeTempFile("delegatePublic", "<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\"\r\n" +
- " prefer=\"public\">\r\n" +
- " <public publicId=\"-//Example//an example V1.0.0//EN\"\r\n" +
- " uri=\"file:///example.dtd\"/>\r\n" +
- "</catalog>");
-
- publicDelegate.setStartString("-//Example//");
- publicDelegate.setCatalogLocation(delegateCat.toURI().toString());
- xmlCatalog.addCatalogElement(publicDelegate);
- try {
- String resolved = xmlCatalog.resolvePublic("-//Example//an example V1.0.0//EN", "example.dtd");
- assertEquals("file:///example.dtd", resolved);
- } finally {
- xmlCatalog.removeCatalogElement(publicDelegate);
- }
- delegateCat.delete();
- }
-
- public void testCatalog11DelegateSystem() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- IDelegateCatalog systemDelegate = (IDelegateCatalog)xmlCatalog.createCatalogElement(IDelegateCatalog.DELEGATE_TYPE_SYSTEM);
-
- File delegateCat = makeTempFile("delegateSystem", "<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">\r\n" +
- " <system systemId=\"http://funky.org/dog\" uri=\"file:///funky-dog.dtd\"/>\r\n" +
- " <systemSuffix systemIdSuffix=\"/cat.dtd\" uri=\"file:///smellycat.xsd\"/>\r\n" +
- " <rewriteSystem systemIdStartString=\"http://funky.org/parrots/\" rewritePrefix=\"file:///dtds/parrots/\"/>\r\n" +
- "</catalog>");
-
- systemDelegate.setStartString("http://funky.org/");
- systemDelegate.setCatalogLocation(delegateCat.toURI().toString());
- xmlCatalog.addCatalogElement(systemDelegate);
- try {
- assertEquals("try systemId entry", "file:///funky-dog.dtd", xmlCatalog.resolveSystem("http://funky.org/dog"));
- assertEquals("try systemSuffix entry", "file:///smellycat.xsd", xmlCatalog.resolveSystem("http://funky.org/some/cat.dtd"));
- assertEquals("try rewriteSystem entry", "file:///dtds/parrots/macaw.xsd", xmlCatalog.resolveSystem("http://funky.org/parrots/macaw.xsd"));
- } finally {
- xmlCatalog.removeCatalogElement(systemDelegate);
- }
- delegateCat.delete();
- }
-
- public void testCatalog11DelegateUri() throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- IDelegateCatalog uriDelegate = (IDelegateCatalog)xmlCatalog.createCatalogElement(IDelegateCatalog.DELEGATE_TYPE_URI);
-
- File delegateCat = makeTempFile("delegateUri", "<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">\r\n" +
- " <uri name=\"urn:funky:dog\" uri=\"file:///funky-dog.dtd\"/>\r\n" +
- " <uriSuffix uriSuffix=\":cat\" uri=\"file:///smellycat.dtd\"/>\r\n" +
- " <rewriteURI uriStartString=\"urn:funky:fish:\" rewritePrefix=\"file:///dtds/\"/>\r\n" +
- "</catalog>");
-
- uriDelegate.setStartString("urn:funky:");
- uriDelegate.setCatalogLocation(delegateCat.toURI().toString());
- xmlCatalog.addCatalogElement(uriDelegate);
- try {
- assertEquals("uri entry", "file:///funky-dog.dtd", xmlCatalog.resolveURI("urn:funky:dog"));
- assertEquals("uriSuffix entry", "file:///smellycat.dtd", xmlCatalog.resolveURI("urn:funky:where-is-my:cat"));
- assertEquals("rewriteUri entry", "file:///dtds/parrot.dtd", xmlCatalog.resolveURI("urn:funky:fish:parrot.dtd"));
- } finally {
- xmlCatalog.removeCatalogElement(uriDelegate);
- }
- delegateCat.delete();
- }
-
- private File makeTempFile(String name, String contents) throws IOException {
- File delegateCat = FileUtil.makeFileFor("catalogs", name, "cat");
- FileWriter fw = new FileWriter(delegateCat);
- fw.write(contents);
- fw.close();
- delegateCat.getParentFile().deleteOnExit();
- return delegateCat;
- }
-
- private void doTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- assertNotNull("expected to find " + EXPECTED_PUBLICID, resolved);
- }
-
- private void doCMTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
- assertNotNull("expected to create content model for " + EXPECTED_PUBLICID, contentModel);
- }
-
- private void doCM_directURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
- }
-
- private void doCM_directURITest_checkElementCount(String EXPECTED_URI, int count) throws MalformedURLException, IOException {
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
- int actualCount = contentModel.getElements().getLength();
- assertEquals("count of element declarations found for content model create from " + EXPECTED_URI, contentModel.getElements().getLength(), actualCount);
- }
-
- private void doURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
- assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
- }
- void doURI_CMTest(String EXPECTED_URI) throws MalformedURLException, IOException {
-
- ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
- assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
- ContentModelManager contentModelManager = ContentModelManager.getInstance();
- CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
- assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
-
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCyclicGroupReferences.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCyclicGroupReferences.java
deleted file mode 100644
index 90b9f16..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCyclicGroupReferences.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.tests.contentmodel;
-
-import java.io.File;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-/**
- * Tests to ensure that the cyclic group references does'nt cause StackOverflow
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=242639
- */
-public class TestCyclicGroupReferences extends TestCase {
- private boolean isSetup = false;
-
- /**
- * The target project name.
- */
- private final String fProjectName = "CyclicGroupReference"; //$NON-NLS-N$
-
- /**
- * The name of the zip file containing the project to import.
- */
- private final String fZipFileName = "cyclicgrouptestfiles.zip"; //$NON-NLS-1$
-
- public TestCyclicGroupReferences() {
- super("TestCyclicGroupReferences");
- }
-
- /**
- * Test CMVisitor for cyclic group references.
- */
- public void testCyclicGroupReferences() {
-
- IFile file = getFile("Test.xml"); //$NON-NLS-1$
- CMVisitor cmVisitor = new CMVisitor();
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager
- .getModelManager();
- model = modelManager.getModelForRead(file);
- assertNotNull("failure loading model", model); //$NON-NLS-1$
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
- assertNotNull("failure getting document", document); //$NON-NLS-1$
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(model);
- assertNotNull("ModelQuery is missing", modelQuery); //$NON-NLS-1$
- IDOMElement documentElement = (IDOMElement) document
- .getDocumentElement();
- assertNotNull("missing document element", documentElement); //$NON-NLS-1$
- CMElementDeclaration cmElementDeclaration = modelQuery
- .getCMElementDeclaration(documentElement);
- assertNotNull(
- "No element declaration for" + documentElement.getNodeName() + " (" + documentElement.getNamespaceURI() + ")", cmElementDeclaration); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- cmVisitor.visitCMElementDeclaration(cmElementDeclaration);
- }
- catch (Throwable th) {
- fail("Test failed :" + th.getClass().getName());
- }
- finally {
- if (model != null) {
- model.releaseFromRead();
- }
- }
-
- }
-
- protected void setUp() throws Exception {
- super.setUp();
-
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- /**
- * Sets up the required project in the workspace.
- *
- * @throws Exception
- */
- private void doSetup() throws Exception {
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(
- ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName,
- ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- URL platformLocationURL = platformLocation.getURL();
- String file = platformLocationURL.getFile();
- unzipUtil.unzipAndImport(zipFile, file);
- unzipUtil.initJavaProject(fProjectName);
- }
-
-
- /**
- * Utility to retrieve the IFile for the given file name. The file is
- * expected to be in the workspace in the project named by
- * {@link #fProjectName}.
- *
- * @param fileName
- * the name of the file to retrieve.
- * @return an IFile.
- */
- private IFile getFile(String fileName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- Path path = new Path(fProjectName + "/" + fileName); //$NON-NLS-1$
- return root.getFile(path);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/XSITypeTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/XSITypeTest.java
deleted file mode 100644
index cf03c1b..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/XSITypeTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 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.tests.contentmodel;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class XSITypeTest extends TestCase {
-
- private static final String ZIP_FILE_NAME = "xsiTestProject.zip"; //$NON-NLS-1$
- private static final String PROJECT_NAME = "TestProject"; //$NON-NLS-1$
-
- protected void setUp() throws Exception {
- super.setUp();
- Location platformLocation = Platform.getInstanceLocation();
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, ZIP_FILE_NAME, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(PROJECT_NAME);
- }
-
- public void testXSIType() {
-
- IStructuredModel structuredModel = null;
- try {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(PROJECT_NAME + "/test.xml")); //$NON-NLS-1$
- IModelManager modelManager = StructuredModelManager.getModelManager();
- structuredModel = modelManager.getModelForRead(file);
- Document document = ((IDOMModel) structuredModel).getDocument();
- ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
- NodeList nodeList = null;
- CMElementDeclaration cmElementDeclaration = null;
-
- // Check for local XSI type
- nodeList = document.getElementsByTagName("a"); //$NON-NLS-1$
- cmElementDeclaration = modelQuery.getCMElementDeclaration((Element)nodeList.item(0));
- assertNotNull("Local XSI type failed to be resolved", cmElementDeclaration); //$NON-NLS-1$
-
- // Check for external XSI type
- nodeList = document.getElementsByTagName("b"); //$NON-NLS-1$
- cmElementDeclaration = modelQuery.getCMElementDeclaration((Element)nodeList.item(0));
- assertNotNull("External XSI type failed to be resolved", cmElementDeclaration); //$NON-NLS-1$
-
- } catch (Exception exception) {
- exception.printStackTrace();
- }
- finally {
- if (structuredModel != null) {
- structuredModel.releaseFromRead();
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index a1f3ee0..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 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.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
- private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file);
- IPath fullPath = file.getFullPath();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(fullPath, LocationKind.IFILE, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(fullPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document: " + (document != null ? document.getClass() : null), expectedDocumentClass.isInstance(document));
- assertTrue("document does not implement IDocumentExtension3", document instanceof IDocumentExtension3);
- IDocumentPartitioner actualPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("wrong partitioner in document: " + actualPartitioner, expectedPartioner.isInstance(actualPartitioner));
- bufferManager.disconnect(fullPath, LocationKind.IFILE, null);
-
-// doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-
- }
-
- /**
- * @param file
- * @param expectedDocumentClass
- * @param expectedPartioner
- * @throws CoreException
- * @throws IOException
- */
-// private void doTestCreateWithFacade(IFile file, Class expectedDocumentClass, Class expectedPartioner) throws IOException, CoreException {
-// DocumentLoaderForXML documentLoaderForXML = new DocumentLoaderForXML();
-// IDocument document = documentLoaderForXML.createNewStructuredDocument(file, null);
-// Assert.assertNotNull(document);
-// }
-
-// private void doTestCreateEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException {
-// IFile file = (IFile) fTestProject.findMember(filePath);
-// assertTrue("Test Case in error. Non-existent file existed! " + filePath, file == null);
-// IPath locationPath = new Path(filePath);
-// IFile nonExistingFile = fTestProject.getFile(locationPath);
-// locationPath = nonExistingFile.getFullPath();
-// ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-// // can not "connect" to non-existant location
-// //bufferManager.connect(locationPath, null);
-// IDocument document = bufferManager.createEmptyDocument(locationPath, LocationKind.IFILE);
-// assertNotNull(document);
-// assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-// assertTrue("wrong partitioner in document: " + document.getDocumentPartitioner(), expectedPartioner.isInstance(document.getDocumentPartitioner()));
-// bufferManager.disconnect(locationPath, LocationKind.IFILE, null);
-//
-// }
-
-
-
- public void testFile103() throws CoreException, IOException {
- doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile107() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile108() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile113() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile114() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile124() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
-// public void testNonExistentXML() throws CoreException {
-// doTestCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-// }
-
- public void testSimpleCase() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- /*
- public void testFile1() throws CoreException, IOException {
- doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
- }
-
-
-
- public void testFile70() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-
- public void testFile71() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-*/
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
deleted file mode 100644
index f0c1d44..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.tests.document;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class GetDocumentRegionsTest extends TestCase {
-
- private boolean fAlreadySetup = false;
- private IStructuredDocument fDoc = null;
- private String fText = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- if(!fAlreadySetup) {
- IStructuredModel sModel = createModel(ContentTypeIdForXML.ContentTypeID_XML);
- fDoc = sModel.getStructuredDocument();
- fText = "<html><head></head><body> text </body></html>";
- fDoc.set(fText);
- fAlreadySetup = true;
- }
- }
-
- public void testGetAllRegions() {
-
- // all regions
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions();
- checkRegions(regions, 7, "<html>", "</html>");
- }
-
- public void testExcludeEnds() {
-
- // leave off the end regions
- // <html>[<head><body> text </body>]</html>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(6,fText.length() - (6+7));
- checkRegions(regions, 5, "<head>", "</body>");
- }
-
- public void testIncludeEnds() {
-
- // include end regions
- // <ht[ml><head></head><body> text </body></ht]ml>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(3,fText.length()- (3+3));
- assertEquals(7, regions.length);
- }
-
- public void testFirstTwo() {
- // first 2 regions
- // <h[tml><h]ead></head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(2,6);
- checkRegions(regions, 2, "<html>", "<head>");
- }
-
- public void testRightSeam() {
- // right seam
- // [<html><head>]</head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,12);
- checkRegions(regions, 2, "<html>", "<head>");
- }
-
- public void testLeftSeam() {
- // left seam
- // </body>[</html>]
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length()-7, 7);
- checkRegions(regions, 1, "</html>", "</html>");
- }
-
- public void testGetLast() {
- // last region only
- // </body></html>|
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length(), 0);
- checkRegions(regions, 1, "</html>", "</html>");
- }
-
- public void testGetFirst() {
- // first region only
- // |<html><head>
- IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,0);
- checkRegions(regions, 1, "<html>", "<html>");
- }
-
- private void checkRegions(IStructuredDocumentRegion[] regions, int expectedLength, String firstText, String lastText) {
-
- //for (int i = 0; i < regions.length; i++)
- // System.out.println(regions[i].getText());
-
- assertEquals(expectedLength, regions.length);
-
- String text = regions[0].getText();
- assertEquals(text, firstText);
-
- text = regions[regions.length-1].getText();
- assertEquals(text, lastText);
- }
-
- private IStructuredModel createModel(String contentTypeID) {
- // create an empty model with its default factories
- IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
- return model;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
deleted file mode 100644
index dd41721..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2010 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.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocumentExtension4;
-import org.eclipse.jface.text.Position;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredDocument extends TestCase {
-
- class TestListener implements IStructuredDocumentListener {
-
- boolean newModelCalled = false;
- boolean noChangeCalled = false;
- boolean nodesReplacedCalled = false;
- boolean regionChangedCalled = false;
- boolean regionsReplacedCalled = false;
-
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- newModelCalled = true;
- }
-
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- noChangeCalled = true;
- }
-
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- nodesReplacedCalled = true;
- }
-
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- regionChangedCalled = true;
- }
-
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- regionsReplacedCalled = true;
- }
- }
-
- private boolean isSetup = false;
-
-
- private final String fProjectName = "DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestStructuredDocument() {
- super("TestStructuredDocument");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
-
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- */
- IStructuredModel getTestModel() throws IOException, CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
- IFile iFile = (IFile) project.findMember("/files/simple.xml");
- // fProjectName + "/files/simple.xml"
-
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit(iFile);
-
-
- return model;
-
- }
-
-
-
- public void testDocumentChangingListener() throws BadLocationException, IOException, CoreException {
- // TODO: may need to fake events to really tests this
-
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
-
- TestListener listener = new TestListener();
-
- sDoc.addDocumentChangingListener(listener);
- String text = sDoc.get();
- sDoc.replace(0, text.length(), text);
-
- sDoc.removeDocumentChangingListener(listener);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReadOnly() throws IOException, CoreException {
-
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String text = sDoc.get();
-
- sDoc.clearReadOnly(0, text.length());
- assertFalse(sDoc.containsReadOnly(0, text.length()));
-
- sDoc.makeReadOnly(0, 10);
- assertTrue(sDoc.containsReadOnly(9, 1));
- assertTrue(sDoc.containsReadOnly(0, text.length()));
-
- sDoc.clearReadOnly(0, text.length());
- assertFalse(sDoc.containsReadOnly(0, text.length()));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetRegionAtCharacterOffset() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegion r = sDoc.getRegionAtCharacterOffset(0);
- assertNotNull("couldn't get region at offset: 0", r);
-
- r = sDoc.getRegionAtCharacterOffset(sDoc.getLength());
- assertNotNull("couldn't get region at offset: " + sDoc.getLength(), r);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
-
- }
- }
-
- public void testGetRegionList() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegionList regions = sDoc.getRegionList();
- assertNotNull("couldn't get region list", regions);
- assertEquals(17, regions.getLength());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String text = sDoc.getText();
- String expectedText = "<?xml version=\"1.0\"?>\r\n<list>\r\n\t<item1 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tone\r\n\t</item1>\r\n\t<item2 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\" >\r\n\t\ttwo\r\n\t</item2>\r\n\t<item3 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tthree\r\n\t</item3>\r\n</list>";
- assertEquals(expectedText, text);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testNewInstance() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocument newDoc = sDoc.newInstance();
- assertNotSame("document instances should be different", sDoc, newDoc);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplace() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.replace(0, sDoc.getLength(), "replaced");
-
- String text = sDoc.getText();
- assertEquals("replaced", text);
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplaceWithModificationStamp() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- if (sDoc instanceof IDocumentExtension4) {
- IDocumentExtension4 ext4 = (IDocumentExtension4)sDoc;
- long modificationStamp = ext4.getModificationStamp() + 1;
-
- ext4.replace(0, sDoc.getLength(), "replaced", modificationStamp);
- String text = sDoc.getText();
- assertEquals("replaced", text);
-
- assertTrue("replace text modification stamp failed", modificationStamp ==((IDocumentExtension4)sDoc).getModificationStamp());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testReplaceText() throws BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
-
- String text = sDoc.getText();
- assertEquals("replaced", text);
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testOverrideReadOnlyReplaceText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.makeReadOnly(0, 1);
-
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
-
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
- assertNotSame("text should not have been replacable (read only)", "replaced", sDoc.getText());
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp (read only) failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
-
- modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp() + 1;
- }
-
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced", true);
- assertEquals("text should have been forced replaced", "replaced", sDoc.getText());
-
- if (modificationStamp > -1)
- assertTrue("replace text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSet() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.set("set text");
-
- assertEquals("set text failed", "set text", sDoc.getText());
- if (modificationStamp > -1)
- assertTrue("set text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetWithModificationStamp() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- if (sDoc instanceof IDocumentExtension4) {
- IDocumentExtension4 ext4 = (IDocumentExtension4)sDoc;
- long modificationStamp = ext4.getModificationStamp() + 1;
- ext4.set("set text", modificationStamp);
-
- assertEquals("set text failed", "set text", sDoc.getText());
- assertTrue("set text modification stamp failed", modificationStamp ==((IDocumentExtension4)sDoc).getModificationStamp());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetText() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- long modificationStamp = -1;
- if (sDoc instanceof IDocumentExtension4) {
- modificationStamp = ((IDocumentExtension4)sDoc).getModificationStamp();
- }
- sDoc.setText(this, "set text");
-
- assertEquals("set text failed", "set text", sDoc.getText());
- if (modificationStamp > -1)
- assertTrue("set text modification stamp failed", modificationStamp !=((IDocumentExtension4)sDoc).getModificationStamp());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetEncodingMemento() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = null;
- sDoc = model.getStructuredDocument();
- EncodingMemento memento = sDoc.getEncodingMemento();
- assertNotNull("couldn't get encoding memento", memento);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /*
- * Verify that the first delimiter is \r\n regardless of
- * preferences or platform
- */
- public void testGetDetectedLineDelimiter() throws IOException, CoreException, BadLocationException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- String delim = sDoc.getLineDelimiter();
- assertEquals("wrong preferred line delmiter", "\r\n", delim);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testSetEncodingMemento() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- EncodingMemento memento = new EncodingMemento();
- sDoc.setEncodingMemento(memento);
- EncodingMemento gottenMemento = sDoc.getEncodingMemento();
- assertEquals("mementos don't match", memento, gottenMemento);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- void setDetectedLineDelimiter() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.setPreferredLineDelimiter("\n");
- String delim = sDoc.getPreferredLineDelimiter();
- assertEquals("set line delimiter failed", "\n", delim);
-
- sDoc.setPreferredLineDelimiter("\r\n");
- delim = sDoc.getPreferredLineDelimiter();
- assertEquals("set line delimiter failed", "\r\n", delim);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testStringMatches() {
- // TODO: will need a test when this API is created
- // IStructuredModel model = getTestModel();
- // IStructuredDocument sDoc = model.getStructuredDocument();
- }
-
- public void testCreatePosition() throws BadPositionCategoryException, BadLocationException, IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument sDoc = model.getStructuredDocument();
- Position p = new Position(0, 10);
- String[] categories = sDoc.getPositionCategories();
- for (int i = 0; i < categories.length; i++) {
- sDoc.addPosition(categories[i], p);
- }
- int found = 0;
- for (int i = 0; i < categories.length; i++) {
- Position[] positions = sDoc.getPositions(categories[i]);
- for (int j = 0; j < positions.length; j++) {
- if (positions[j] == p) {
- found++;
- }
- }
- }
- assertEquals("wrong number of positions", categories.length, found);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /** Tests that when a tag is read-only, its entirety is read-only. */
- public void testReadOnlyTag() throws CoreException, IOException {
- IStructuredModel model = getTestModel();
- try {
- IDOMNode node = (IDOMNode) model.getIndexedRegion(23);
- assertNotNull("couldn't get node", node);
- // all descendants are read-only
- node.setChildEditable(false);
- IStructuredDocument document = model.getStructuredDocument();
- assertTrue(document.containsReadOnly(80, 0));
-
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
deleted file mode 100644
index e57a089..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestXMLDocumentLoader extends TestCase {
-
- private boolean isSetup = false;
- private final String fProjectName ="DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
-
- public void testCreateNewEmptyStructuredDocument() {
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- document = xmlDocumentLoader.createNewStructuredDocument();
- assertNotNull("failed to create Empty document", document);
- }
-
- public void testCreateNewStructuredDocumentFromFile() {
- // from a file
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(file);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from IFile", document);
- }
-
- public void testCreateNewStructuredDocumentFromInputStream() {
- String fileLocation = "/files/simple.xml";
- String absoluteFileLocation = Platform.getInstanceLocation() + fProjectName + fileLocation;
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from InputStream", document);
- }
-
- public void testCreateNewDocumentFromReaderWithEncodingRule() {
-
- String fileLocation = "/files/simple.xml";
- String absoluteFileLocation = Platform.getInstanceLocation().getURL().getPath().toString() + fProjectName + fileLocation;
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-
- XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
- IDocument document = null;
-
- try {
- document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- assertNotNull("failed to create document from InputStream with EncodingRule", document);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
deleted file mode 100644
index 555e1b7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
+++ /dev/null
@@ -1,78 +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.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-/**
- * @author nsd
- *
- */
-public class TransitionTests extends UnzippedProjectTester {
-
- /**
- *
- */
- public TransitionTests() {
- super();
- }
-
-
- public void testSoftRevert() throws CoreException, IOException {
- String filePath = "testfiles/xml/EmptyFile.xml"; //$NON-NLS-1$
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file); //$NON-NLS-1$
- IPath locationPath = file.getLocation();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(locationPath, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", document instanceof BasicStructuredDocument); //$NON-NLS-1$
- assertTrue("wrong partitioner in document.", ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING) instanceof StructuredTextPartitionerForXML); //$NON-NLS-1$
-
- IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document);
- try {
- try {
- document.replace(0, 0, "__"); //$NON-NLS-1$
- document.replace(2, 0, "<a"); //$NON-NLS-1$
- document.replace(4, 0, ">"); //$NON-NLS-1$
- document.replace(5, 0, " "); //$NON-NLS-1$
- }
- catch (BadLocationException e) {
- assertNull(e);
- }
- document.set(""); //$NON-NLS-1$
- }
- finally {
- model.releaseFromEdit();
-
- bufferManager.disconnect(locationPath, null);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index d47ca29..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-
-/*
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class UnzippedProjectTester extends TestCase {
-
- protected static IProject fTestProject;
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = SSEModelXMLTestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- private static final boolean DEBUG = false;
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
- IWorkspace workspace = getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java
deleted file mode 100644
index 86637a0..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/AttrImplTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class AttrImplTests extends TestCase {
-
- private static final String contents = "<elementName attrPrefix:local='lorem' />"; //$NON-NLS-1$
- private static final String xmlNamespaceContents = "<elementName xml:space=\"preserve\"/>";
-
- public AttrImplTests() {
- }
-
- public AttrImplTests(String name) {
- super(name);
- }
-
- public void testAttrImplPrefix() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Element documentElement = model.getDocument().getDocumentElement();
- assertNotNull("no document element found", documentElement);
- NamedNodeMap attributes = documentElement.getAttributes();
- assertTrue("no attributes found", attributes.getLength() > 0);
- Attr attribute = (Attr) attributes.item(0);
- assertEquals("attribute prefix was not as expected", "attrPrefix", attribute.getPrefix());
- }
-
- public void testAttrImplLocalName() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Element documentElement = model.getDocument().getDocumentElement();
- assertNotNull("no document element found", documentElement);
- NamedNodeMap attributes = documentElement.getAttributes();
- assertTrue("no attributes found", attributes.getLength() > 0);
- Attr attribute = (Attr) attributes.item(0);
- assertEquals("attribute local name was not as expected", "local", attribute.getLocalName());
- }
-
- public void testNamespaceURIOnCreation() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Attr attr = model.getDocument().createAttribute("simple");
- assertNull("namespace was found", attr.getNamespaceURI());
-
- Attr attr2 = model.getDocument().createAttributeNS("http://lorem.ipsum", "complex");
- assertEquals("attribute namespace URI was not as expected", "http://lorem.ipsum", attr2.getNamespaceURI());
- Attr attr3 = model.getDocument().createAttributeNS(null, "complex");
- assertEquals("attribute namespace URI was not as expected", null, attr3.getNamespaceURI());
- }
-
- public void testNullAttributeValue() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Attr attribute = model.getDocument().createAttribute("attr");
- try {
- attribute.setNodeValue(null);
- } catch (NullPointerException npe) {
- fail("Setting a null node value caused a NullPointerException.");
- }
- }
-
- public void testGetAttributeNSForXMLNamespace() {
- final String xmlns = "http://www.w3.org/XML/1998/namespace";
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(xmlNamespaceContents);
-
- Element element = model.getDocument().getDocumentElement();
- String value = element.getAttributeNS(xmlns, "space");
- assertEquals("Did not find space attribute for XML Namespace", "preserve", value);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/DOMImplementationTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/DOMImplementationTests.java
deleted file mode 100644
index e39fa08..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/DOMImplementationTests.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2011 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.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Node;
-
-public class DOMImplementationTests extends TestCase {
-
- public void testCreateDocumentEmpty() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final Document document = model.createDocument(null, null, null);
- assertNull("The document should be empty", document.getFirstChild());
- }
-
- public void testCreateDocumentNoDocumentType() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final Document document = model.createDocument("http://eclipse.org", "foo:bar", null);
- final Node node = document.getFirstChild();
- assertNotNull("Document should not be empty", node);
- assertEquals("Element qualified name is not equal", "foo:bar", node.getNodeName());
- assertEquals("Element namespace URI is not equal", "http://eclipse.org", node.getNamespaceURI());
- }
-
- public void testCreateDocumentUsedDoctype() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final DocumentType doctype = model.createDocumentType("bar", "publicTest", "systemTest");
- IDOMDocument document = model.getDocument();
- document.appendChild(doctype);
-
- try {
- model.createDocument("http://eclipse.org", "foo:bar", doctype);
- }
- catch (DOMException e) {
- assertEquals("Wrong DOMExcetion thrown", DOMException.WRONG_DOCUMENT_ERR, e.code);
- return;
- }
- fail("Reusing the doctype from another document should have caused an exception");
- }
-
- public void testCreateDocument() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final DocumentType doctype = model.createDocumentType("bar", "publicTest", "systemTest");
- final Document document = model.createDocument("http://eclipse.org", "foo:bar", doctype);
- assertEquals("Document's doctype was not properly set", doctype, document.getDoctype());
- assertEquals("Document owner node is not set properly", document, doctype.getOwnerDocument());
-
- final Node node = document.getDocumentElement();
- assertNotNull("Document should not be empty", node);
- assertEquals("Element qualified name is not equal", "foo:bar", node.getNodeName());
- assertEquals("Element namespace URI is not equal", "http://eclipse.org", node.getNamespaceURI());
- }
-
- public void testCreateDocumentIllegalChar() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final char[] illegalTest = new char[] { '`', '~', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '=', '+', ';', '\'', '\"', ',', '\\', '/', '<', '>', '[', ']', '{', '}', ' '};
- for (int i = 0; i < illegalTest.length; i++) {
- try {
- model.createDocument("http://eclipse.org", "foo:" + illegalTest[i], null);
- }
- catch (DOMException e) {
- assertEquals("Did not receive the correct DOMException", DOMException.INVALID_CHARACTER_ERR, e.code);
- continue;
- }
- fail("Illegal character ["+ illegalTest[i]+"] allowed in document element qualified name");
- }
-
- final String[] illegalNames = { " ", "f oo:bar", "foo: bar", "foo:bar ", ""};
- for (int i = 0; i < illegalNames.length; i++) {
- try {
- model.createDocument("http://eclipse.org", illegalNames[i], null);
- }
- catch (DOMException e) {
- assertEquals("Did not receive the correct DOMException for ["+ illegalNames[i]+ "]", DOMException.INVALID_CHARACTER_ERR, e.code);
- continue;
- }
- fail("Illegal character ["+ illegalNames[i]+"] allowed in document element qualified name");
- }
- }
-
- public void testCreateDocumentIllegalNamespace() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- try {
- model.createDocument(null, "foo:bar", null);
- }
- catch (DOMException e) {
- assertEquals("Did not receive the correct DOMException", DOMException.NAMESPACE_ERR, e.code);
- return;
- }
- fail("No exceptions for illegal input");
- }
-
- public void testCreateDocumentNamespaceWithNoQualifiedName() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- try {
- model.createDocument("http://eclipse.org", null, null);
- }
- catch (DOMException e) {
- assertEquals("Did not receive the correct DOMException", DOMException.NAMESPACE_ERR, e.code);
- return;
- }
- fail("No exceptions for illegal input");
- }
-
- public void testCreateDocumentLegalNamespaceXML() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- try {
- model.createDocument("http://www.w3.org/XML/1998/namespace", "xml:bar", null);
- }
- catch (DOMException e) {
- fail("xml prefix is allowed for the namespace http://www.w3.org/XML/1998/namespace");
- }
- }
-
- public void testCreateDocumentIllegalNamespaceXML() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- try {
- model.createDocument("http://eclipse.org", "xml:bar", null);
- }
- catch (DOMException e) {
- assertEquals("Did not receive the correct DOMException", DOMException.NAMESPACE_ERR, e.code);
- return;
- }
- fail("No exceptions for illegal input");
- }
-
- public void testCreateDocumentMalformedQualifiedNames() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final String[] names = {"foo:", "foo:.", "foo:-", "foo:bar:baz"};
- for (int i = 0; i < names.length; i++) {
- try {
- model.createDocument("http://eclipse.org", names[i], null);
- }
- catch (DOMException e) {
- assertEquals("Did not receive the correct DOMException for [" + names[i] +"]", DOMException.NAMESPACE_ERR, e.code);
- continue;
- }
- fail("Malformd qualified name ["+ names[i]+"]");
- }
- }
-
- public void testCreateDocumentWellformedQualifiedNames() {
- final DOMModelImpl model = (DOMModelImpl) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- final String[] names = {"bar", "foo:bar"};
- for (int i = 0; i < names.length; i++) {
- try {
- model.createDocument("http://eclipse.org", names[i], null);
- }
- catch (DOMException e) {
- fail("[" + names[i] +"] flagged as an invalid qualified name");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java
deleted file mode 100644
index 49aaa0d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/ElementImplTests.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 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.tests.dom;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMAttributeDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDataTypeImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMElementDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class ElementImplTests extends TestCase {
-
- private static final String contents = "<elementPrefix:localName attrPrefix:local='lorem' xmlns:elementPrefix='urn:prefix' xmlns:attributePrefix='urn:attribute:prefix' />"; //$NON-NLS-1$
- private static final String decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; //$NON-NLS-1$
- public ElementImplTests() {
- }
-
- public ElementImplTests(String name) {
- super(name);
- }
-
- public void testElementImplPrefix() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Element documentElement = model.getDocument().getDocumentElement();
- assertNotNull("no document element found", documentElement);
- assertEquals("attribute prefix was not as expected", "elementPrefix", documentElement.getPrefix());
- }
-
- public void testElementImplLocalName() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Element documentElement = model.getDocument().getDocumentElement();
- assertNotNull("no document element found", documentElement);
- assertEquals("attribute local name was not as expected", "localName", documentElement.getLocalName());
- }
-
- public void testAttrBasedElementNamespace() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Element documentElement = model.getDocument().getDocumentElement();
- assertNotNull("no document element found", documentElement);
- assertNotNull("Namespace was not found.", documentElement.getNamespaceURI());
- String namespace = documentElement.getNamespaceURI();
- assertEquals("attribute local name was not as expected", "urn:prefix", namespace);
- }
-
- public void testNamespaceURIOnCreation() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(contents);
-
- Element element = model.getDocument().createElement("simple");
- assertNull("namespace was found", element.getNamespaceURI());
-
- Element element2 = model.getDocument().createElementNS("http://lorem.ipsum", "complex");
- assertEquals("attribute namespace URI was not as expected", "http://lorem.ipsum", element2.getNamespaceURI());
- Element element3 = model.getDocument().createElementNS(null, "complex");
- assertEquals("attribute namespace URI was not as expected", null, element3.getNamespaceURI());
- }
-
- public void testGetElementsByTagNameNoChildren() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("root");
- document.appendChild(root);
-
- NodeList children = root.getElementsByTagName("*");
- assertEquals(0, children.getLength());
- }
-
- public void testGetElementsByTagNameChildren() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("root");
- document.appendChild(root);
- root.appendChild(document.createElement("child"));
- root.appendChild(document.createElement("child"));
-
- NodeList children = root.getElementsByTagName("*");
- assertEquals(2, children.getLength());
- }
-
- public void testGetElementsByTagNameChildrenBySameName() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("child");
- document.appendChild(root);
- root.appendChild(document.createElement("child"));
- root.appendChild(document.createElement("child"));
-
- NodeList children = root.getElementsByTagName("child");
- assertEquals(2, children.getLength());
- }
-
- public void testGetElementsByTagNameNS() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("test:root");
- root.setAttribute("xmlns:test", "http://test");
- document.appendChild(root);
- root.appendChild(document.createElement("test:child"));
- root.appendChild(document.createElement("test:child"));
-
- NodeList children = root.getElementsByTagNameNS("http://test", "*");
- assertEquals(2, children.getLength());
- }
-
- public void testGetElementsByTagNameNSTestNS() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("test:root");
- root.setAttribute("xmlns:test", "http://test");
- root.setAttribute("xmlns:test2", "http://test2");
- document.appendChild(root);
- root.appendChild(document.createElement("test:child"));
- root.appendChild(document.createElement("test:child"));
- root.appendChild(document.createElement("test2:child"));
-
- NodeList children = root.getElementsByTagNameNS("http://test", "*");
- assertEquals(2, children.getLength());
- }
-
- public void testGetElementsByTagNameNSAnyNS() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("test:root");
- root.setAttribute("xmlns:test", "http://test");
- root.setAttribute("xmlns:test2", "http://test2");
- document.appendChild(root);
- root.appendChild(document.createElement("test:child"));
- root.appendChild(document.createElement("test:child"));
- root.appendChild(document.createElement("test2:child"));
-
- NodeList children = root.getElementsByTagNameNS("*", "*");
- assertEquals(3, children.getLength());
- }
-
- public void testRemoveNonexistantAttrByName() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("test:root");
- root.setAttribute("xmlns:test", "http://test");
- root.setAttribute("xmlns:test2", "http://test2");
- document.appendChild(root);
-
- boolean success = false;
- try {
- root.removeAttribute(getName());
- success = true;
- }
- catch (DOMException ex) {
- assertTrue("threw_NOT_FOUND_ERR", ex.code != DOMException.NOT_FOUND_ERR);
- }
- assertTrue("threw exception", success);
- }
-
- public void testSetAttrWithImpliedDefault() {
- IDOMModel model = null;
- try {
- model = (IDOMModel) getModelForRead("testfiles/time.xml");
- if (model != null) {
- IDOMDocument document = model.getDocument();
- Element element = document.getDocumentElement();
- assertNotNull(element);
- assertEquals("0", element.getAttribute("hour")); // Default value should be 0
- element.setAttribute("hour", "12");
- assertEquals("12", element.getAttribute("hour"));
- }
- }
- finally {
- if (model != null) {
- model.releaseFromRead();
- }
- }
- }
-
- public void testRemoveAttrWithImpliedDefault() {
- IDOMModel model = null;
- try {
- model = (IDOMModel) getModelForRead("testfiles/time.xml");
- if (model != null) {
- IDOMDocument document = model.getDocument();
- Element element = document.getDocumentElement();
- assertNotNull(element);
- assertEquals("0", element.getAttribute("hour")); // Default value should be 0
- element.setAttribute("hour", "12");
- assertEquals("12", element.getAttribute("hour"));
- element.removeAttribute("hour"); // value should be reset to default/0
- assertEquals("0", element.getAttribute("hour"));
- }
- }
- finally {
- if (model != null) {
- model.releaseFromRead();
- }
- }
- }
-
- public void testOwnerElementWithImpliedDefaultAttribute() {
- IDOMModel model = null;
- try {
- model = (IDOMModel) getModelForRead("testfiles/time.xml");
- if (model != null) {
- IDOMDocument document = model.getDocument();
- Element element = document.getDocumentElement();
- assertNotNull(element);
- Attr attr = element.getAttributeNode("hour");
- assertNull(attr);
- }
- }
- finally {
- if (model != null) {
- model.releaseFromRead();
- }
- }
- }
-
- public void testCMAttrWithNullImpliedValue() {
- IDOMModel model = null;
- try {
- model = (IDOMModel) getModelForRead("testfiles/time.xml");
- if (model != null) {
- IDOMDocument document = model.getDocument();
- final String ATTR_NAME = "second";
- // Setup a ModelQueryAdapter whose sole purpose it to provide a attribute declaration with a null implied value
- document.addAdapter(new ModelQueryAdapter() {
-
- public boolean isAdapterForType(Object type) {
- return type.equals(ModelQueryAdapter.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- }
-
- public CMDocumentCache getCMDocumentCache() {
- return null;
- }
-
- public org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver getIdResolver() {
- return null;
- }
-
- public ModelQuery getModelQuery() {
- return new ModelQueryImpl(null) {
- /* (non-Javadoc)
- * @see org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl#getCMElementDeclaration(org.w3c.dom.Element)
- */
- public CMElementDeclaration getCMElementDeclaration(Element element) {
- final CMElementDeclaration decl = new CMElementDeclarationImpl(null, null);
- CMNamedNodeMapImpl map = (CMNamedNodeMapImpl) decl.getAttributes();
- map.put(new CMAttributeDeclarationImpl(ATTR_NAME, CMAttributeDeclaration.OPTIONAL, new CMDataTypeImpl(ATTR_NAME, (String) null)));
- return decl;
- }
- };
- }
-
- public void release() {
-
- }
-
- public void setIdResolver(org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver newIdResolver) {
-
- }
-
- });
- Element element = document.getDocumentElement();
- assertNotNull(element);
- assertEquals("", element.getAttribute(ATTR_NAME)); // Default value should be 0
- }
- }
- finally {
- if (model != null) {
- model.releaseFromRead();
- }
- }
- }
-
- public IStructuredModel getModelForRead(String path) {
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(path);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + path);
- final String baseFile = getClass().getResource(path).toString();
- model = modelManager.getModelForRead(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
deleted file mode 100644
index 0e28c67..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 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.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-
-public class NameValidatorTests extends TestCase {
-
- private int nTrials = 100;
-
- public NameValidatorTests(String name) {
- super(name);
- }
-
- private void doTest(int testNumber, String testString, Boolean expectedValidity) {
-// System.out.println();
- boolean isValid = NameValidator.isValid(testString);
- assertEquals("testNumber: " + testNumber, expectedValidity.booleanValue(), isValid);
-// System.out.println();
- }
-
- public void testIsValid() {
- Object[][] testees = new Object[][]{
- {"initial",Boolean.TRUE}, //0
- {"foo",Boolean.TRUE}, //1
- {"4",Boolean.FALSE}, //2
- {"9999", Boolean.FALSE}, //3
- {"f9999", Boolean.TRUE}, //4
- {"", Boolean.FALSE}, //5
- {"got space", Boolean.FALSE}, //6
- {" spacebefore", Boolean.FALSE}, //7
- {"spaceafter ", Boolean.FALSE}, //8
- {"ns:namespace", Boolean.TRUE}, //9
- {":funnyns", Boolean.TRUE}, //10
- /* ISSUE: is "endns:" really valid name */
- {"endns:", Boolean.TRUE}, //11
- {"us_underscore", Boolean.TRUE}, //12
- {"_underscore", Boolean.TRUE}, //13
- {"underscore_", Boolean.TRUE}, //14
- {"averylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersize", Boolean.TRUE}, //15
- {"<bracket", Boolean.FALSE}, //16
- {"bracket<", Boolean.FALSE}, //17
- {"bracket", Boolean.TRUE}, //18
- {"per.iod", Boolean.TRUE}, //19
- };
- for (int i = 0; i < testees.length; i++) {
- for (int j = 0; j < nTrials; j++) {
- doTest(i, (String)testees[i][0], (Boolean) testees[i][1]);
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeContainerTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeContainerTests.java
deleted file mode 100644
index 3e6d942..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeContainerTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2011 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.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- *
- */
-public class NodeContainerTests extends TestCase {
-
- private static final String CONTENT_1 = "<root><a id='a'></a></root>";
- private static final String CONTENT_2 = "<root><a id='a'><b id='b'></b></a></root>";
-
- /**
- * Default Constructor
- */
- public NodeContainerTests() {
- super("Test NodeContainer");
- }
-
- /**
- * Constructor
- *
- * @param name the name of this test run
- */
- public NodeContainerTests(String name) {
- super(name);
- }
-
- public void testAppendValidChild() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(CONTENT_1);
-
- IDOMDocument doc = model.getDocument();
-
- Element a = doc.getElementById("a");
- assertNotNull("Could not find element with id 'a' in " + CONTENT_1, a);
-
- Element b = doc.createElement("b");
- b.setAttribute("id", "b");
-
- try {
- a.appendChild(b);
- } catch (DOMException e) {
- fail("Should have been able to append " + b + " as a child of " + a);
- }
- }
-
- public void testAppendParentAsChildOfChild() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(CONTENT_2);
-
- IDOMDocument doc = model.getDocument();
-
- Element a = doc.getElementById("a");
- assertNotNull("Could not find element with id 'a' in " + CONTENT_2, a);
-
- Element b = doc.getElementById("b");
- assertNotNull("Could not find element with id 'b' in " + CONTENT_2, b);
-
- boolean threwException = false;
- try {
- b.appendChild(a);
- } catch (DOMException e) {
- assertEquals("Wrong type of exception was thrown: " + e, DOMException.HIERARCHY_REQUEST_ERR, e.code);
- threwException = true;
- }
-
- assertTrue("A DOMException with code HIERARCHY_REQUEST_ERR should have been thrown when appending a parent to its own child", threwException);
- }
-
- public void testReplaceChild() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(CONTENT_1);
-
- IDOMDocument doc = model.getDocument();
-
- Element a = doc.getElementById("a");
- assertNotNull("Could not find element with id 'a' in " + CONTENT_1, a);
-
- Element root = (Element) a.getParentNode();
-
- assertNotNull("Could not find parent node 'root'", root);
- Node replaced = root.replaceChild(a, a);
- assertTrue("Not replaced is not the same as 'a'", a == replaced);
- assertTrue("Child of root is not 'a'", root.getFirstChild() == a);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java
deleted file mode 100644
index 9fec6ca..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NodeListImplTests.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.NodeListImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class NodeListImplTests extends TestCase {
-
- private static class AccessorNodeList extends NodeListImpl {
- public Node appendNode(Node node) {
- return super.appendNode(node);
- }
-
- public Node insertNode(Node node, int index) {
- return super.insertNode(node, index);
- }
-
- public Node removeNode(int index) {
- return super.removeNode(index);
- }
-
- }
-
- public NodeListImplTests() {
- }
-
- public NodeListImplTests(String name) {
- super(name);
- }
-
- public void testInsertAtIndex() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- assertEquals("non-zero length at start", 0, list.getLength());
-
- list.appendNode(document.createElement("test0"));
- list.appendNode(document.createElement("test1"));
- list.appendNode(document.createElement("test2"));
- list.appendNode(document.createElement("test3"));
- list.appendNode(document.createElement("test4"));
- list.appendNode(document.createElement("test5"));
- list.appendNode(document.createElement("test6"));
-
- list.insertNode(document.createElement("test"), 3);
-
- assertEquals("list size did not increment", 8, list.getLength());
-
- assertEquals("test0 was not at expected index", "test0", list.item(0).getLocalName());
- assertEquals("test1 was not at expected index", "test1", list.item(1).getLocalName());
- assertEquals("test2 was not at expected index", "test2", list.item(2).getLocalName());
- assertEquals("test was not at expected index", "test", list.item(3).getLocalName());
- assertEquals("test3 was not at expected index", "test3", list.item(4).getLocalName());
- assertEquals("test4 was not at expected index", "test4", list.item(5).getLocalName());
- assertEquals("test5 was not at expected index", "test5", list.item(6).getLocalName());
- assertEquals("test6 was not at expected index", "test6", list.item(7).getLocalName());
- }
-
- public void testRemoveFromIndex() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- list.appendNode(document.createElement("test0"));
- list.appendNode(document.createElement("test1"));
- list.appendNode(document.createElement("test2"));
- list.appendNode(document.createElement("test3"));
- list.appendNode(document.createElement("test4"));
- list.appendNode(document.createElement("test5"));
- list.appendNode(document.createElement("test6"));
- assertEquals("wrong length after setup", 7, list.getLength());
-
- Node excised = list.removeNode(3);
- assertEquals("test3 was not the one removed", "test3", excised.getLocalName());
-
- assertEquals("wrong length after removal", 6, list.getLength());
- assertEquals("test0 was not at expected index", "test0", list.item(0).getLocalName());
- assertEquals("test1 was not at expected index", "test1", list.item(1).getLocalName());
- assertEquals("test2 was not at expected index", "test2", list.item(2).getLocalName());
- assertEquals("test4 was not at expected index", "test4", list.item(3).getLocalName());
- assertEquals("test5 was not at expected index", "test5", list.item(4).getLocalName());
- assertEquals("test6 was not at expected index", "test6", list.item(5).getLocalName());
- }
-
- public void testInsertAtNegativeIndex() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- // appends on bad value
- list.insertNode(document.createElement("test-1"),-1);
- assertEquals("wrong length after insert at negative index", 1, list.getLength());
- }
-
- public void testRemoveFromNegativeIndex() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- list.appendNode(document.createElement("test-1"));
- // ignores bad index
- list.removeNode(-1);
- assertEquals("wrong length after removal at negative index", 1, list.getLength());
- }
-
- public void testInsertAtExcessiveIndex() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- // appends on bad value
- list.insertNode(document.createElement("test3"), 3);
- assertEquals("wrong length after insert at out of bounds index", 1, list.getLength());
- }
-
- public void testRemoveFromExcessiveIndex() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- list.appendNode(document.createElement("test0"));
- // ignores bad index
- list.removeNode(3);
- assertEquals("wrong length after removal at nonexistent index", 1, list.getLength());
- }
-
- public void testAppend() {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- Document document = model.getDocument();
-
- AccessorNodeList list = new AccessorNodeList();
-
- assertEquals("non-zero length at start", 0, list.getLength());
-
- list.appendNode(document.createElement("test1"));
- assertEquals("list size did not increment", 1, list.getLength());
-
- list.appendNode(document.createElement("test2"));
- assertEquals("list size did not increment", 2, list.getLength());
-
- list.appendNode(document.createElement("test3"));
- assertEquals("list size did not increment", 3, list.getLength());
-
- Node element4 = list.appendNode(document.createElement("test4"));
- assertEquals("list size did not increment", 4, list.getLength());
- assertEquals("test4 not returned from append", "test4", element4.getLocalName());
-
- Node element5 = list.appendNode(document.createElement("test5"));
- assertEquals("list size did not increment", 5, list.getLength());
- assertEquals("test5 not returned from append", "test5", element5.getLocalName());
-
- Node element6 = list.appendNode(document.createElement("test6"));
- assertEquals("list size did not increment", 6, list.getLength());
- assertEquals("test6 not returned from append", "test6", element6.getLocalName());
-
- Node element7 = list.appendNode(document.createElement("test7"));
- assertEquals("list size did not increment", 7, list.getLength());
- assertEquals("test7 not returned from append", "test7", element7.getLocalName());
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/RegionChangedAdapterNotificationTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/RegionChangedAdapterNotificationTests.java
deleted file mode 100644
index b55cf3f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/RegionChangedAdapterNotificationTests.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.tests.dom;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Tests performance minimization of adapter notifications for RegionChanged
- * events, which would affect areas like formatting performance
- */
-public class RegionChangedAdapterNotificationTests extends TestCase {
- public RegionChangedAdapterNotificationTests() {
- this("RegionChanged Adapter Notification tests");
- }
-
- /**
- * Constructor for UpdaterTestRegionChanged.
- *
- * @param name
- */
- public RegionChangedAdapterNotificationTests(String name) {
- super(name);
- }
-
- public void testAppendWhitespaceToAttributeName() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 4, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b = c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testAppendWhitespaceToEqualSign() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 5, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testAppendWhitespaceToTagName() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
- ((INodeNotifier) document).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 2, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testAppendWhitespaceToAttributeValue() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 7, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c ></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testChangeAttributeName() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1, -1};
- INodeAdapter adapter = new INodeAdapter() {
- private int eCount = 0;
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- assertTrue("Received more than 2 events.", eCount < 2);
- changed[eCount++] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 4, 0, "d");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
- assertEquals("Property Removed Adapter Notification event not sent " + changed[0] + " " + structuredDocument.get(), INodeNotifier.REMOVE, changed[0]);
- assertEquals("Property Added Adapter Notification event not sent " + changed[1] + " " + structuredDocument.get(), INodeNotifier.ADD, changed[1]);
-
- assertEquals("unexpected document content", "<a bd= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
- public void testChangeAttributeValue() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 6, 0, "d");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("Property Changed Adapter Notification event not sent " + changed[0] + " " +structuredDocument.get(), INodeNotifier.CHANGE, changed[0]);
-
- assertEquals("unexpected document content", "<a b= dc></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
- public void testChangeTagName1() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) document).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 1, 0, "d");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertNotSame("DOM Node not replaced", before, after);
-
- assertEquals("Structure Changed notification not sent to adapter " + changed[0] + " to parent " +structuredDocument.get(), INodeNotifier.STRUCTURE_CHANGED, changed[0]);
-
- assertEquals("unexpected document content", "<da b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testChangeTagName2() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) document).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 2, 0, "d");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertNotSame("DOM Node not replaced", before, after);
-
- assertEquals("Structure Changed notification not sent to adapter " + changed[0] + " to parent " +structuredDocument.get(), INodeNotifier.STRUCTURE_CHANGED, changed[0]);
-
- assertEquals("unexpected document content", "<ad b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testChangeQuotedAttributeValue() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= \"c\"></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 7, 0, "d");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("Property Changed Adapter Notification event not sent " + changed[0] + " " +structuredDocument.get(), INodeNotifier.CHANGE, changed[0]);
-
- assertEquals("unexpected document content", "<a b= \"dc\"></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testPrependSpaceToAttributeName() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 3, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testPrependSpaceToEqualSign() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 4, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b = c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testPrependSpaceToAttributeValue() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 6, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testRemoveTrailingSpaceFromEqualSign() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 5, 1, "");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b=c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
- public void testRemoveTrailingSpaceFromAttributeName() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b = c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 4, 1, "");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testRemoveTrailingSpaceFromAttributeValue() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b = c ></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 8, 1, "");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b = c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testRemoveTrailingSpaceFromTagName() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
- ((INodeNotifier) document).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 2, 1, "");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testRemoveTrailingSpaceFromTagName2() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
- ((INodeNotifier) document).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 3, 1, "");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-
- public void testReplaceTrailingSpaceofEqualSignWithTwoSpaces() throws IOException {
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(getName() + ".xml", new NullInputStream(), null);
-
- try {
- Document document = model.getDocument();
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- structuredDocument.setText(this, "<a b= c></a>");
-
- Node before = document.getFirstChild();
- final int[] changed = new int[]{-1};
- INodeAdapter adapter = new INodeAdapter() {
- public boolean isAdapterForType(Object type) {
- return type.equals(RegionChangedAdapterNotificationTests.class);
- }
-
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- changed[0] = eventType;
- }
- };
- ((INodeNotifier) before).addAdapter(adapter);
-
- Object[] originalRegions = structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray();
- StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 5, 0, " ");
- assertTrue("Region instances changed", Arrays.equals(originalRegions, structuredDocument.getFirstStructuredDocumentRegion().getRegions().toArray()));
-
- assertTrue(fmEvent instanceof RegionChangedEvent);
-
- Node after = document.getFirstChild();
-
- assertEquals("Node replaced", before, after);
-
- assertEquals("unexpected adapter notification event sent " + structuredDocument.get(), -1, changed[0]);
-
- assertEquals("unexpected document content", "<a b= c></a>", structuredDocument.get());
- }
- finally {
- model.releaseFromEdit();
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/testfiles/time.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/testfiles/time.dtd
deleted file mode 100644
index 17b17fb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/testfiles/time.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ELEMENT time EMPTY>
-<!ATTLIST time hour CDATA "0">
-<!ATTLIST time minute CDATA "0">
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/testfiles/time.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/testfiles/time.xml
deleted file mode 100644
index fc405a0..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/testfiles/time.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE time SYSTEM "time.dtd" >
-<time minute="5"></time>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
deleted file mode 100644
index 1dd1a18..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 Eclipse Foundation
- * 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:
- * Jesper Steen Møller - jesper@selskabet.org
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.StructuredFormatPreferencesXML;
-import org.eclipse.wst.xml.core.tests.util.StringCompareUtil;
-
-/**
- * @deprecated Use TestPartitionFormatterXML instead
- *
- */
-public class TestFormatProcessorXML extends TestCase {
-
- private static final boolean SPLIT_MULTI_ATTRS = false;
-
- private static final String INDENT = "\t";
-
- private static final boolean CLEAR_ALL_BLANK_LINES = false;
-
- private static final int MAX_LINE_WIDTH = 72;
-
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
-
- public TestFormatProcessorXML(String name) {
- super(name);
- }
-
- private FormatProcessorXML formatProcessor;
-
- protected void setUp() throws Exception {
- formatProcessor = new FormatProcessorXML();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- protected void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals(beforePath, afterPath, true);
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, boolean resetPreferences) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- if (resetPreferences)
- resetPreferencesToDefault();
-
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = false;
- formatProcessor.formatModel(beforeModel);
- ((AbstractStructuredFormatProcessor) formatProcessor).refreshFormatPreferences = true;
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- private void resetPreferencesToDefault() {
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- formatPreferences.setLineWidth(MAX_LINE_WIDTH);
- formatPreferences.setClearAllBlankLines(CLEAR_ALL_BLANK_LINES);
- formatPreferences.setIndent(INDENT);
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(SPLIT_MULTI_ATTRS);
- }
-
- public void testSimpleXml() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/simple-standalone.xml", "testfiles/xml/simple-standalone-fmt.xml");
- }
-
- public void testPreserveFormat() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-standalone.xml", "testfiles/xml/xml-space-preserve-standalone-fmt.xml");
- }
-
- public void testPreserveFormatDTD() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-dtd.xml", "testfiles/xml/xml-space-preserve-dtd-fmt.xml");
- }
-
- public void testOneLineFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG115716
- formatAndAssertEquals("testfiles/xml/oneline.xml", "testfiles/xml/oneline-fmt.xml");
- }
-
- public void testOneLineTextNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG166441
- formatAndAssertEquals("testfiles/xml/onelineTextNode.xml", "testfiles/xml/onelineTextNode-fmt.xml");
- }
-
- public void testEmptyContentNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG174243
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatAndAssertEquals("testfiles/xml/usetagswithemptycontent.xml", "testfiles/xml/usetagswithemptycontent-fmt.xml", false);
- }
-
- public void testXSLFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG108074
- formatAndAssertEquals("testfiles/xml/xslattributetext.xsl", "testfiles/xml/xslattributetext-fmt.xsl");
- }
-
- public void testEntityFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG102076
- formatAndAssertEquals("testfiles/xml/entities.xml", "testfiles/xml/entities-fmt.xml");
- }
-
- public void testPreservePCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG84688
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setPreservePCDATAContent(true);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-yes-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setPreservePCDATAContent(false);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-no-fmt.xml", false);
- }
-
- public void testPreserveCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG161330
- formatAndAssertEquals("testfiles/xml/usecdata.xml", "testfiles/xml/usecdata-fmt.xml");
- formatAndAssertEquals("testfiles/xml/usecdata2.xml", "testfiles/xml/usecdata2-fmt.xml");
- }
-
- public void testSplitAttributesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-noalign-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-noalign-fmt.xml", false);
-
- }
-
- public void testAlignEndBracketFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- IStructuredFormatPreferences formatPreferences = formatProcessor.getFormatPreferences();
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml", false);
-
- ((StructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- ((StructuredFormatPreferencesXML) formatPreferences).setAlignEndBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml", false);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
deleted file mode 100644
index e6a0c31..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2011 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.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.URIResolver;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.formatter.DefaultXMLPartitionFormatter;
-import org.eclipse.wst.xml.core.internal.formatter.XMLFormattingPreferences;
-import org.eclipse.wst.xml.core.tests.util.StringCompareUtil;
-
-public class TestPartitionFormatterXML extends TestCase {
- private static final String UTF_8 = "UTF-8";
-
- private StringCompareUtil fStringCompareUtil;
- private DefaultXMLPartitionFormatter partitionFormatter;
-
- protected void setUp() throws Exception {
- partitionFormatter = new DefaultXMLPartitionFormatter();
- fStringCompareUtil = new StringCompareUtil();
- }
-
- /**
- * must release model (from edit) after
- *
- * @param filename
- * relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(final String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream " + filename);
- final String baseFile = getClass().getResource(filename).toString();
- model = modelManager.getModelForEdit(baseFile, inStream, new URIResolver() {
-
- String fBase = baseFile;
-
- public String getFileBaseLocation() {
- return fBase;
- }
-
- public String getLocationByURI(String uri) {
- return getLocationByURI(uri, fBase);
- }
-
- public String getLocationByURI(String uri, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri);
- }
-
- public String getLocationByURI(String uri, String baseReference) {
- int lastSlash = baseReference.lastIndexOf("/");
- if (lastSlash > 0)
- return baseReference.substring(0, lastSlash + 1) + uri;
- return baseReference;
- }
-
- public String getLocationByURI(String uri, String baseReference, boolean resolveCrossProjectLinks) {
- return getLocationByURI(uri, baseReference);
- }
-
- public IProject getProject() {
- return null;
- }
-
- public IContainer getRootLocation() {
- return null;
- }
-
- public InputStream getURIStream(String uri) {
- return getClass().getResourceAsStream(getLocationByURI(uri));
- }
-
- public void setFileBaseLocation(String newLocation) {
- this.fBase = newLocation;
- }
-
- public void setProject(IProject newProject) {
- }
- });
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- protected void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals(beforePath, afterPath, null);
- }
-
- private void formatAndAssertEquals(String beforePath, String afterPath, XMLFormattingPreferences prefs) throws UnsupportedEncodingException, IOException, CoreException {
- IStructuredModel beforeModel = null, afterModel = null;
- try {
- beforeModel = getModelForEdit(beforePath);
- assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
- afterModel = getModelForEdit(afterPath);
- assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
- IStructuredDocument document = beforeModel.getStructuredDocument();
-
- String normalizedContents = document.get();
- normalizedContents = StringUtils.replace(normalizedContents, "\r\n", "\n");
- normalizedContents = StringUtils.replace(normalizedContents, "\r", "\n");
- document.set(normalizedContents);
-
- if (prefs == null)
- prefs = new XMLFormattingPreferences();
- TextEdit edit = partitionFormatter.format(beforeModel, 0, document.getLength(), prefs);
- try {
- edit.apply(document);
- }
- catch (MalformedTreeException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (BadLocationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
- beforeModel.save(formattedBytes); // "beforeModel" should now be
- // after the formatter
-
- ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
- afterModel.save(afterBytes);
-
- String expectedContents = new String(afterBytes.toByteArray(), UTF_8);
- String actualContents = new String(formattedBytes.toByteArray(), UTF_8);
-
- /* Make some adjustments to ignore cross platform line delimiter issues */
- expectedContents = StringUtils.replace(expectedContents, "\r\n", "\n");
- expectedContents = StringUtils.replace(expectedContents, "\r", "\n");
- actualContents = StringUtils.replace(actualContents, "\r\n", "\n");
- actualContents = StringUtils.replace(actualContents, "\r", "\n");
-
- assertTrue("Formatted document differs from the expected.\nExpected Contents:\n" + expectedContents + "\nActual Contents:\n" + actualContents, fStringCompareUtil.equalsIgnoreLineSeperator(expectedContents, actualContents));
- }
- finally {
- if (beforeModel != null)
- beforeModel.releaseFromEdit();
- if (afterModel != null)
- afterModel.releaseFromEdit();
- }
- }
-
- public void testSimpleXml() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // Bug [228495] - Result should have blank lines cleared
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/simple-standalone.xml", "testfiles/xml/simple-standalone-newfmt.xml", prefs);
- }
-
- public void testWhitespaceFormatXSD() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 194698
- formatAndAssertEquals("testfiles/xml/xml-whitespace-xsd.xml", "testfiles/xml/xml-whitespace-xsd-actual.xml");
- }
-
- public void testPreserveFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // Bug [228495] - Result should have blank lines cleared
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-standalone.xml", "testfiles/xml/xml-space-preserve-standalone-newfmt.xml", prefs);
- }
-
- public void testPreserveFormatDTD() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // Bug [228495] - Result should have blank lines cleared
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-space-preserve-dtd.xml", "testfiles/xml/xml-space-preserve-dtd-newfmt.xml", prefs);
- }
-
- public void testOneLineFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG115716
- formatAndAssertEquals("testfiles/xml/oneline.xml", "testfiles/xml/oneline-fmt.xml");
- }
-
- public void testOneLineTextNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // BUG166441
- formatAndAssertEquals("testfiles/xml/onelineTextNode.xml", "testfiles/xml/onelineTextNode-newfmt.xml");
- }
-
- public void testEmptyContentNodeFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG174243
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setIndentMultipleAttributes(true);
- formatAndAssertEquals("testfiles/xml/usetagswithemptycontent.xml", "testfiles/xml/usetagswithemptycontent-fmt.xml", prefs);
- }
-
- public void testXSLFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG108074
- formatAndAssertEquals("testfiles/xml/xslattributetext.xsl", "testfiles/xml/xslattributetext-fmt.xsl");
- }
-
- public void testEntityFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // BUG102076
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/entities.xml", "testfiles/xml/entities-newfmt.xml", prefs);
- }
-
- public void testPreservePCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG84688
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setPCDataWhitespaceStrategy(XMLFormattingPreferences.PRESERVE);
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-yes-fmt.xml", prefs);
-
- // results are different than old formatter
- prefs.setPCDataWhitespaceStrategy(XMLFormattingPreferences.COLLAPSE);
- formatAndAssertEquals("testfiles/xml/xml-preservepcdata.xml", "testfiles/xml/xml-preservepcdata-no-newfmt.xml", prefs);
- }
-
- public void testPreserveCDATAFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG161330
- formatAndAssertEquals("testfiles/xml/usecdata.xml", "testfiles/xml/usecdata-fmt.xml");
- }
-
- public void testPreserveCDATAFormat2() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/usecdata2.xml", "testfiles/xml/usecdata2-fmt.xml");
- }
-
- public void testSplitAttributesFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG113584
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- // the below tests are slighty different from old formatter test
- prefs.setIndentMultipleAttributes(true);
- prefs.setAlignFinalBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes2.xml", "testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml", prefs);
-
- prefs.setIndentMultipleAttributes(false);
- prefs.setAlignFinalBracket(false);
- formatAndAssertEquals("testfiles/xml/multiattributes2.xml", "testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml", prefs);
-
- }
-
- public void testAlignEndBracketFormat() throws UnsupportedEncodingException, IOException, CoreException {
- // results are different than old formatter
- // BUG113584
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setIndentMultipleAttributes(false);
- prefs.setAlignFinalBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml", prefs);
-
- // results are different than old formatter
- prefs.setIndentMultipleAttributes(true);
- prefs.setAlignFinalBracket(true);
- formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml", prefs);
- }
-
- public void testSpaceBeforeEmptyCloseTag() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 195264
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setSpaceBeforeEmptyCloseTag(false);
- formatAndAssertEquals("testfiles/xml/xml-empty-tag-space.xml", "testfiles/xml/xml-empty-tag-space-none-newfmt.xml", prefs);
-
- prefs.setSpaceBeforeEmptyCloseTag(true);
- formatAndAssertEquals("testfiles/xml/xml-empty-tag-space.xml", "testfiles/xml/xml-empty-tag-space-newfmt.xml", prefs);
- }
-
- public void testProcessingInstruction() throws UnsupportedEncodingException, IOException, CoreException {
- // BUG198297
- formatAndAssertEquals("testfiles/xml/processinginstruction.xml", "testfiles/xml/processinginstruction-fmt.xml");
- }
-
- public void testComments() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 226821
- formatAndAssertEquals("testfiles/xml/xml-comment.xml", "testfiles/xml/xml-comment-newfmt.xml");
- }
-
- public void testComments_short_NoText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-short-NoText.xml", "testfiles/xml/xml-comment-short-NoText-formated.xml");
- }
-
- public void testComments_short_InbetweenText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-short-InbetweenText.xml", "testfiles/xml/xml-comment-short-InbetweenText-formated.xml");
- }
-
- public void testComments_short_SameLineText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-short-SameLineText.xml", "testfiles/xml/xml-comment-short-SameLineText-formated.xml");
- }
-
- public void testComments_short_EverywhereText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-short-EverywhereText.xml", "testfiles/xml/xml-comment-short-EverywhereText-formated.xml");
- }
-
- public void testComments_long_NoText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-long-NoText.xml", "testfiles/xml/xml-comment-long-NoText-formated.xml");
- }
-
- public void testComments_long_InbetweenText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-long-InbetweenText.xml", "testfiles/xml/xml-comment-long-InbetweenText-formated.xml");
- }
-
- public void testComments_long_SameLineText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-long-SameLineText.xml", "testfiles/xml/xml-comment-long-SameLineText-formated.xml");
- }
-
- public void testComments_long_EverywhereText() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 258512
- formatAndAssertEquals("testfiles/xml/xml-comment-long-EverywhereText.xml", "testfiles/xml/xml-comment-long-EverywhereText-formated.xml");
- }
-
- public void testKeepEmptyLines() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 228495
- // Test that formatting keeps empty lines
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(false);
- formatAndAssertEquals("testfiles/xml/xml-keep-blank-lines.xml", "testfiles/xml/xml-keep-blank-lines-fmt.xml", prefs);
- }
-
- public void testClearBlankLines() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 228495
- // Test that formatting clears empty lines
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/xml-keep-blank-lines.xml", "testfiles/xml/xml-clear-blank-lines-fmt.xml", prefs);
- }
-
- public void testFormatMalformedEndTag() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 221279
- // Test that malformed end tags do not cause a NPE and format the document
- formatAndAssertEquals("testfiles/xml/xml-221279.xml", "testfiles/xml/xml-221279-fmt.xml");
- }
-
- public void testFormatWithFracturedXMLContent() throws UnsupportedEncodingException, IOException, CoreException {
- // Bug 229135
- // Test that text content that is split into multiple document regions does not stop the formatter
- formatAndAssertEquals("testfiles/xml/xml-229135.xml", "testfiles/xml/xml-229135-fmt.xml");
- }
-
- public void testFormatCommentsJoinLinesDisabled() throws UnsupportedEncodingException, IOException, CoreException {
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setJoinCommentLines(false);
- formatAndAssertEquals("testfiles/xml/xml-join-lines-disabled.xml", "testfiles/xml/xml-join-lines-disabled-fmt.xml", prefs);
- }
-
- public void testFormatCommentsDisabled() throws UnsupportedEncodingException, IOException, CoreException {
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setFormatCommentText(false);
- formatAndAssertEquals("testfiles/xml/xml-format-comments-disabled.xml", "testfiles/xml/xml-format-comments-disabled-fmt.xml", prefs);
- }
-
- public void testFormatDocumentLevelComment() throws UnsupportedEncodingException, IOException, CoreException {
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setJoinCommentLines(false);
- formatAndAssertEquals("testfiles/xml/xml-format-document-level-comment.xml", "testfiles/xml/xml-format-document-level-comment-fmt.xml", prefs);
- }
-
- public void testFormatDocumentLevelShortComment() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/xml-format-document-level-short-comment.xml", "testfiles/xml/xml-format-document-level-short-comment-fmt.xml");
- }
-
- public void testNestedEndTag() throws UnsupportedEncodingException, IOException, CoreException {
- formatAndAssertEquals("testfiles/xml/nested-endtag.xml", "testfiles/xml/nested-endtag-fmt.xml");
- }
-
- /**
- * Tests the scenario where two regions are capable of formatting the same whitespace. See
- * https://bugs.eclipse.org/353451
- */
- public void testBug353451() throws UnsupportedEncodingException, IOException, CoreException {
- XMLFormattingPreferences prefs = new XMLFormattingPreferences();
- prefs.setClearAllBlankLines(true);
- formatAndAssertEquals("testfiles/xml/bug353451.xml", "testfiles/xml/bug353451-fmt.xml", prefs);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/bug353451-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/bug353451-fmt.xml
deleted file mode 100644
index 68f4952..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/bug353451-fmt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<a>
- &
- <!-- Comment -->
-</a>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/bug353451.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/bug353451.xml
deleted file mode 100644
index 613f776..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/bug353451.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<a>
-&
-<!-- Comment -->
-</a>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml
deleted file mode 100644
index 9c2e657..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
- This document contains no child
- &EII;s. It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml
deleted file mode 100644
index 0ec803c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities-newfmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
- This document contains no child &EII;s.
- It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml
deleted file mode 100644
index 15bdedc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/entities.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE document [
-<!ENTITY EII "<emph>element information item</emph>">
-]>
-<document>
-This document contains no child &EII;s. It does contain a non&EII;.
-</document>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml
deleted file mode 100644
index 6d1390e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-noalign-fmt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa">
- </totally>
- <like fer="sure" no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml
deleted file mode 100644
index 9e897c3..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-fmt.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- >
- </totally>
- <like fer="sure" no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml
deleted file mode 100644
index fbe6b2a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-nosplit-yesalign-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- ></totally>
- <like fer="sure" no="way">yes way i have text right here
- wheeeeeeeeeeeeeeeeeeeeeeee</like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml
deleted file mode 100644
index d757592..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-noalign-fmt.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa">
- </totally>
- <like
- fer="sure"
- no="way">
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml
deleted file mode 100644
index c7be96e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-fmt.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- >
- </totally>
- <like
- fer="sure"
- no="way"
- >
- yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee
- </like>
- <seriously
- no="joke"
- for="reals"
- />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml
deleted file mode 100644
index 0b0d26f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"
- ></totally>
- <like
- fer="sure"
- no="way"
- >yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee</like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml
deleted file mode 100644
index 0de9b4d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
-<totally rad="dude" intense="man" crazy="and insane" scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
-<like fer="sure" no="way">yes way i have text right here wheeeeeeeeeeeeeeeeeeeeeeee</like>
-<seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml
deleted file mode 100644
index f0ca39d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-nosplit-noalign-newfmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally rad="dude" intense="man" crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
- <like fer="sure" no="way">yes way i have text right here</like>
- <seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml
deleted file mode 100644
index 422676f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2-yessplit-noalign-newfmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
- <totally
- rad="dude"
- intense="man"
- crazy="and insane"
- scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
- <like
- fer="sure"
- no="way">yes way i have text right here</like>
- <seriously
- no="joke"
- for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml
deleted file mode 100644
index e12dece..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/multiattributes2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<omg>
-<totally rad="dude" intense="man" crazy="and insane" scream="aaaaaaaaaaaaaaaaaaaaaaaaaaa"></totally>
-<like fer="sure" no="way">yes way i have text right here</like>
-<seriously no="joke" for="reals" />
-</omg>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag-fmt.xml
deleted file mode 100644
index fec218a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <parent>
- aaa
- </parent>
-</configuration>
-
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag.xml
deleted file mode 100644
index daa164c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/nested-endtag.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-<parent>
-aaa
-</parent>
-</configuration>
-
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml
deleted file mode 100644
index 72aa19d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline-fmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one>
- <two></two>
- <three>
- <four></four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml
deleted file mode 100644
index 1723240..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/oneline.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><one><two></two><three><four></four></three></one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml
deleted file mode 100644
index 2709548..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-fmt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one attr="1" attr2="2">
- <two></two>
- <three>
- <four></four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml
deleted file mode 100644
index 240df07..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode-newfmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<one attr="1" attr2="2">
- <two></two>
- <three>
- <four>
- </four>
- </three>
-</one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml
deleted file mode 100644
index b513f6a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/onelineTextNode.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><one attr="1" attr2="2"> <two></two><three><four> </four></three></one>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml
deleted file mode 100644
index 6628ffb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction-fmt.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<testdoc><?testing test="yay"?>
-</testdoc>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml
deleted file mode 100644
index 6628ffb..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/processinginstruction.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<testdoc><?testing test="yay"?>
-</testdoc>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml
deleted file mode 100644
index c5bb621..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-fmt.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test
-
- of the formatter
-
- which should be easy to pass.
- <data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' '
- a4=" " a5=' ' a6=" " attr2="short-value"
- attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken"
- attr3="short-value">
-
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b</b>
- <b>b</b><!-- Comment here don't twiddle with spaces in them -->
- <b>b</b>
- <b>b</b>
- <b>b</b>
- </a>
- <?target why am I here
- ?>
- </data-stuff>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml
deleted file mode 100644
index 77b7fb9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone-newfmt.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test of the formatter which should be easy to
- pass.
- <data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' '
- a4=" " a5=' ' a6=" " attr2="short-value"
- attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken"
- attr3="short-value">
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b </b>
- <b> b</b> <!-- Comment here don't twiddle with spaces in them -->
- <b> b </b>
- <b> b
- </b>
- <b>b</b>
- </a><?target why am I here
- ?>
- </data-stuff>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml
deleted file mode 100644
index 823ef32..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/simple-standalone.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<main>
- This is just a simple test
-
- of the formatter
-
-which should be easy to pass.
-<data-stuff attr1="short-value" a0="" a1=' ' a2=" " a3=' ' a4=" " a5=' ' a6=" " attr2="short-value" attr-which-is-really-really-oh-so-horribly-long-yes-sir-1="also quite fantastically long value which mustn't be broken" attr3="short-value"
- >
-
- <cdata>
- <![CDATA[
- Daa, daa, da, da - da, da - da, da
-
- Can't touch this!
- (spaces here)
- (tab here)
- ]]>
- </cdata>
- <a>
- <b>b</b>
- <b>b </b>
- <b> b</b> <!-- Comment here don't twiddle with spaces in them --> <b> b </b>
- <b>
- b
- </b>
- <b>b</b>
- </a><?target why am I here
- ?>
-</data-stuff>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd
deleted file mode 100644
index 67217a5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/tagswithemptycontent.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT topmost (empty,emptywithattribute)>
-<!ELEMENT empty EMPTY>
-<!ELEMENT emptywithattribute EMPTY>
-<!ATTLIST emptywithattribute
- myattribute1 CDATA #IMPLIED
- myattribute2 CDATA #IMPLIED>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml
deleted file mode 100644
index dfe43e1..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata-fmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manytags>
- <sometag someattr="someattrvalue"><![CDATA[
- blah blah blah
- nothing
- changes
- in
-here
-]]></sometag>
-</manytags>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml
deleted file mode 100644
index ebc176a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manytags> <sometag someattr="someattrvalue"><![CDATA[
- blah blah blah
- nothing
- changes
- in
-here
-]]></sometag>
-</manytags>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml
deleted file mode 100644
index 9a4a3a2..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2-fmt.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
- nospacebetweenmeandcdata<![CDATA[
-function matchwo(a,b)
-{
-if (a < b && a < 0) then
- {
- return 1
- }
-else
- {
- return 0
- }
-}
-]]>nospacebetweenmeandcdata
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml
deleted file mode 100644
index bab4ec9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usecdata2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-nospacebetweenmeandcdata<![CDATA[
-function matchwo(a,b)
-{
-if (a < b && a < 0) then
- {
- return 1
- }
-else
- {
- return 0
- }
-}
-]]>nospacebetweenmeandcdata
-</script>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml
deleted file mode 100644
index 5ac2eef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topmost SYSTEM "tagswithemptycontent.dtd" >
-<topmost>
- <empty></empty>
- <emptywithattribute
- myattribute1=""
- myattribute2=""></emptywithattribute>
-</topmost>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml
deleted file mode 100644
index 7299cd5..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/usetagswithemptycontent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE topmost SYSTEM "tagswithemptycontent.dtd" >
-<topmost>
- <empty></empty>
- <emptywithattribute myattribute1="" myattribute2=""></emptywithattribute>
-</topmost>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml
deleted file mode 100644
index a02fc0e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279-fmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<library>
- <books>
- <book>
- <title>Title</title>
- <author>Author</author>
- </book
- </books>
-</library>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml
deleted file mode 100644
index 2930b22..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-221279.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<library>
-<books>
-<book>
-<title>Title</title>
-<author>Author</author>
- </book </books>
-</library>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
deleted file mode 100644
index 95a571c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135-fmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book>
- <title>This & That</title>
- <author>Some person</author>
- <reviews>
- <review id="0"> "A wonderful and gripping epic story." </review>
- <review id="1">"I liked it."</review>
- </reviews>
- <preview> Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</preview>
- <releaseDate>
- <pattern>%yyyy-%mm-%dd</pattern>
- <date>2009-04-13</date>
- </releaseDate>
-</book>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
deleted file mode 100644
index 67efa2d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-229135.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book>
- <title>This & That</title>
-<author>Some person</author>
-<reviews>
- <review id="0"> "A wonderful and gripping epic story." </review>
-<review id="1">"I liked it."</review>
-</reviews>
- <preview> Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</preview>
- <releaseDate>
-<pattern>%yyyy-%mm-%dd</pattern>
-<date>2009-04-13</date>
- </releaseDate>
-</book>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml
deleted file mode 100644
index 3a817a1..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-clear-blank-lines-fmt.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <!-- Comment node -->
- <nocontent></nocontent>
- <mixedcontent>
- Textnode with some trailing whitespace - should be collapsed and some
- of the text should be wrapped
- <mixed>All text</mixed>
- </mixedcontent>
- <nocontent>
- </nocontent>
- <somemorenocontent>
- <indentmore>
- <evenmore>
- </evenmore>
- </indentmore>
- </somemorenocontent>
-</root>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText-formated.xml
deleted file mode 100644
index 53a83dd..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText-formated.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- test
-
- test<!-- comment 16 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
- test <!-- comment 17 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
- test <!-- comment 18 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText.xml
deleted file mode 100644
index ab095ef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-EverywhereText.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-test
-
-test<!-- comment 16 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
- test <!-- comment 17 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
- test <!-- comment 18 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-test
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText-formated.xml
deleted file mode 100644
index 60b31a6..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText-formated.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
- test
- <!-- comment 6 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- test
- <!-- comment 7 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- test
- <!-- comment 8 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
-
- <!-- comment 9 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
-
- <!-- comment 10 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-
- test
-
- <!-- comment 12 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText.xml
deleted file mode 100644
index d2763d8..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-InbetweenText.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
-test
-<!-- comment 6 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-test
- <!-- comment 7 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-test
- <!-- comment 8 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-test
-
-
-<!-- comment 9 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- test
-
-
- <!-- comment 10 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-
- test
-
- <!-- comment 12 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText-formated.xml
deleted file mode 100644
index 0d7759f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText-formated.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- <!-- comment 0 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- <!-- comment 1 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- <!-- comment 2 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- <!-- comment 3 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- <!-- comment 4 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- <!-- comment 5 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText.xml
deleted file mode 100644
index bab161f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-NoText.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-<!-- comment 0 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- <!-- comment 1 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- <!-- comment 2 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-<!-- comment 3 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- <!-- comment 4 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
- <!-- comment 5 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText-formated.xml
deleted file mode 100644
index 8bb30e4..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText-formated.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
- test<!-- comment 13 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- test <!-- comment 14 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- test <!-- comment 15 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn
- asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText.xml
deleted file mode 100644
index 36e0cdc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-long-SameLineText.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
-test<!-- comment 13 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- test <!-- comment 14 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
- test <!-- comment 15 alkdjfali;jfeklaj alkdfja akldjfoie dhgfliahge dkfioeafn asdifjavne adjkfaen avhauioehajdnf adofjnanvaeiuw adnfaijen -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml
deleted file mode 100644
index 07da335..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-newfmt.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node>
- <inner>
- <another>
- <else> <!-- Don't wrap -->
- </else><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus.
- Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum.
- Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt
- mauris s -->
- Sometext stuff in the document
- <something>
- <else xml:space="preserve"><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus. Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt mauris s--></else>
- </something>
- </another>
- </inner>
-</node>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText-formated.xml
deleted file mode 100644
index 6545ad4..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText-formated.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- test
-
- test<!-- comment 16 -->
-
- test
-
- test <!-- comment 17 -->
-
- test
-
- test <!-- comment 18 -->
-
- test
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText.xml
deleted file mode 100644
index e085534..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-EverywhereText.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-test
-
-test<!-- comment 16 -->
-
- test
-
- test <!-- comment 17 -->
-
- test
-
- test <!-- comment 18 -->
-
-test
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText-formated.xml
deleted file mode 100644
index 34a4943..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText-formated.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
- test
- <!-- comment 6 -->
- test
- <!-- comment 7 -->
- test
- <!-- comment 8 -->
-
- test
-
-
- <!-- comment 9 -->
-
- test
-
-
- <!-- comment 10 -->
-
-
- test
-
- <!-- comment 12 -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText.xml
deleted file mode 100644
index 97b0aad..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-InbetweenText.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
-test
-<!-- comment 6 -->
-test
- <!-- comment 7 -->
-test
- <!-- comment 8 -->
-
-test
-
-
-<!-- comment 9 -->
-
- test
-
-
- <!-- comment 10 -->
-
-
- test
-
- <!-- comment 12 -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText-formated.xml
deleted file mode 100644
index 1efb442..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText-formated.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- <!-- comment 0 -->
- <!-- comment 1 -->
- <!-- comment 2 -->
-
- <!-- comment 3 -->
-
- <!-- comment 4 -->
-
- <!-- comment 5 -->
-
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText.xml
deleted file mode 100644
index 14b2e73..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-NoText.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-<!-- comment 0 -->
- <!-- comment 1 -->
- <!-- comment 2 -->
-
-<!-- comment 3 -->
-
- <!-- comment 4 -->
-
- <!-- comment 5 -->
-
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText-formated.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText-formated.xml
deleted file mode 100644
index c796c3f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText-formated.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
- test<!-- comment 13 -->
- test <!-- comment 14 -->
- test <!-- comment 15 -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText.xml
deleted file mode 100644
index a570caa..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment-short-SameLineText.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
-
-test<!-- comment 13 -->
- test <!-- comment 14 -->
- test <!-- comment 15 -->
-
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml
deleted file mode 100644
index 9afec7f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-comment.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node>
- <inner>
- <another>
- <else> <!-- Don't wrap -->
- </else><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus. Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt mauris s-->
- Sometext stuff in the document
- <something>
- <else xml:space="preserve"><!-- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas elit est, convallis id, congue in, posuere et, nunc. Sed ut lectus. Nulla eu diam ac nulla placerat tincidunt. In vitae tellus. Suspendisse rutrum. Nunc mollis urna at mauris suscipit lacinia. Praesent in ante. Maecenas tincidunt mauris s--></else>
- </something>
- </another>
- </inner>
-</node>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml
deleted file mode 100644
index e29afd7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<main>
- <a tag="with"> Some content </a>
- <nocontentwithspace />
- <nocontentwithoutspace />
- <nocontent withattr="stuff" />
- <nocontent />
- <manylinedcontent with="attributes" />
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml
deleted file mode 100644
index 48e61d7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<main>
- <a tag="with"> Some content </a>
- <nocontentwithspace/>
- <nocontentwithoutspace/>
- <nocontent withattr="stuff"/>
- <nocontent/>
- <manylinedcontent with="attributes"/>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml
deleted file mode 100644
index d6fafea..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<main>
- <a tag="with"> Some content </a>
- <nocontentwithspace />
- <nocontentwithoutspace/>
- <nocontent withattr="stuff"/>
- <nocontent />
- <manylinedcontent
-
- with="attributes"
- />
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled-fmt.xml
deleted file mode 100644
index b7e7098..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled-fmt.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- <!--
- This is my node header.
- -->
- <node>
- Text
- </node>
-
-<!-- This is my node footer. The text should be a little too long for the line, but that's ok. Just make sure it's not formatted. -->
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled.xml
deleted file mode 100644
index b7e7098..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-comments-disabled.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- <!--
- This is my node header.
- -->
- <node>
- Text
- </node>
-
-<!-- This is my node footer. The text should be a little too long for the line, but that's ok. Just make sure it's not formatted. -->
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment-fmt.xml
deleted file mode 100644
index 455189f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment-fmt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This is my document-
- level comment.
- Format the rest, but do not indent me any further.
--->
-<root>
- <leaf></leaf>
- <leaf></leaf>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment.xml
deleted file mode 100644
index 82cf122..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-comment.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This is my document-
- level comment.
- Format the rest, but do not indent me any further.
--->
-<root>
-<leaf></leaf>
-<leaf></leaf>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment-fmt.xml
deleted file mode 100644
index a3c5c7d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment-fmt.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Testfile. Don't indent this comment. -->
-<root>
- <test></test>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment.xml
deleted file mode 100644
index 5bad861..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-format-document-level-short-comment.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Testfile. Don't indent this comment. -->
-<root>
-<test></test>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled-fmt.xml
deleted file mode 100644
index 25eaaa6..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled-fmt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <!--
- My header comment. This file should be formatted, but
- the formatting of this header comment
- should stay the same.
- -->
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled.xml
deleted file mode 100644
index 3d67013..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-join-lines-disabled.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-<!--
- My header comment. This file should be formatted, but
- the formatting of this header comment
- should stay the same.
--->
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml
deleted file mode 100644
index 11d5af9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines-fmt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-
- <!-- Comment node -->
-
- <nocontent></nocontent>
-
- <mixedcontent>
- Textnode with some trailing whitespace - should be
-
- collapsed and some of the text should be wrapped
-
- <mixed>All text</mixed>
-
- </mixedcontent>
-
-
-
-
- <nocontent>
- </nocontent>
-
- <somemorenocontent>
- <indentmore>
- <evenmore>
-
- </evenmore>
- </indentmore>
- </somemorenocontent>
-</root>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml
deleted file mode 100644
index 39cad2d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-keep-blank-lines.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <root>
-
- <!-- Comment node -->
-
- <nocontent></nocontent>
-
-<mixedcontent>
-Textnode with some trailing whitespace - should be
-
-collapsed and some of the text should be wrapped
-
- <mixed>All text</mixed>
-
-</mixedcontent>
-
-
-
-
- <nocontent> </nocontent>
-
- <somemorenocontent>
- <indentmore> <evenmore>
-
- </evenmore>
- </indentmore>
- </somemorenocontent>
- </root>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml
deleted file mode 100644
index 60683f9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-fmt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata>
- i have
-
-
-
- spaces
- </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml
deleted file mode 100644
index 1faea51..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-no-newfmt.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have spaces
- </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml
deleted file mode 100644
index 5109c8f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata-yes-fmt.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have
-
-
-
- spaces </ihavepcdata>
- <idont />
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd
deleted file mode 100644
index fd086dc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT pcdatalicious (ihavepcdata*,idont*,neitherdoi*)>
-<!ELEMENT ihavepcdata (#PCDATA)>
-<!ELEMENT idont EMPTY>
-<!ELEMENT neitherdoi ANY>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml
deleted file mode 100644
index 2874f87..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-preservepcdata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pcdatalicious SYSTEM "xml-preservepcdata.dtd" >
-<pcdatalicious>
- <ihavepcdata>i have pcdata</ihavepcdata>
- <ihavepcdata> i have
-
-
-
- spaces </ihavepcdata>
- <idont/>
- <neitherdoi>do i have pcdata? i'm not sure. boo hoo.</neitherdoi>
-</pcdatalicious>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml
deleted file mode 100644
index f30c047..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-actual.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can
-
- and should be reformatted.
- </preserve>
-
-<preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2> <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml
deleted file mode 100644
index 271e6f2..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-fmt.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>this is not a target, strip spaces as you please</nothing>
- <preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can
-
- and should be reformatted.
- </preserve>
-
- <preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man
-
- is an
-
- island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2>
- <nothing>this is not a target, strip spaces as you please</nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml
deleted file mode 100644
index fcef547..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd-newfmt.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing> this is not a target, strip spaces as you please
- </nothing>
- <preserve>
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
- This particular text can and should be reformatted.
- </preserve>
- <preserve>
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default>
- No man is an island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2>
- <nothing> this is not a target, strip spaces as you please
- </nothing>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml
deleted file mode 100644
index 28a2b72..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-dtd.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE main SYSTEM "xml-space-preserve.dtd">
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve >
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter.
- <preserve xml:space="default">
-This particular text can
-
-and should be reformatted.</preserve>
-
-<preserve >
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default >
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <preserve2>
-This particular
- text may
-
-not reformatted.</preserve2> <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml
deleted file mode 100644
index 551193e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-fmt.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing>this is not a target, strip spaces as you please</nothing>
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default
- xml:space="default">
- No man
-
- is an
-
- island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing>this is not a target, strip spaces as you please</nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml
deleted file mode 100644
index 64ae836..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone-newfmt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing> this is not a target, strip spaces as you please
- </nothing>
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
- <preserve xml:space="preserve" but-attr-clean-up="true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default
- xml:space="default">
- No man is an island, . . . but this section is, really, so clean it up
- please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing> this is not a target, strip spaces as you please
- </nothing>
-</main>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml
deleted file mode 100644
index 7b18757..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve-standalone.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<main>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-<preserve xml:space="preserve" but-attr-clean-up = "true">
- This is just
-
- a simple test
- .
- .
- .
- </preserve>
- of the formatter
-<preserve xml:space="preserve" but-attr-clean-up = "true">
- This is just
-
- a simple test
- <nothing>
- this space is not for sale OR FORMATTING
- , please </nothing> <!-- NOTE THE SPACES --> <space-default xml:space="default">
- No man
-
- is an
-
- island, .
- .
- .
- but this section is, really, so clean it up please - waste of space
- </space-default>
- .
- . This should be space preserved
- </preserve>
- <nothing>
- this is not a target, strip spaces as
- you please </nothing>
-</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd
deleted file mode 100644
index ce567bf..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-space-preserve.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml encoding="US-ASCII"?>
-
-<!ELEMENT main (#PCDATA | nothing | preserve | preserve2)* >
-
-<!ELEMENT preserve (#PCDATA | nothing | space-default)* >
-<!ATTLIST preserve xml:space (default|preserve) 'preserve'>
-
-<!ELEMENT preserve2 (#PCDATA | nothing | space-default)* >
-<!ATTLIST preserve2 xml:space NMTOKEN #FIXED "preserve">
-
-<!ELEMENT space-default (#PCDATA| nothing | preserve)*>
-<!ATTLIST space-default xml:space (default|preserve) 'default'>
-
-<!ELEMENT nothing (#PCDATA) >
-
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml
deleted file mode 100644
index ee3e5fc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd-actual.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<song xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="xml-whitespace.xsd">
- <artist> Some Singer </artist>
- <year>1992</year>
- <title>Lorem ipsum dolor</title>
- <lyrics>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Nunc in nisi. Integer quis quam non eros accumsan elementum.
- Sed risus orci, lobortis at, pulvinar at, varius ac, neque.
- Morbi pede nulla, tincidunt ac, semper vel, ultricies vitae, lacus.
- Nunc nunc. </lyrics>
- <length>2</length>
- <album>Lorem ipsum dolor</album>
- <location> Raleigh, NC, USA </location>
-</song>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml
deleted file mode 100644
index 78ebd1b..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace-xsd.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<song xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="xml-whitespace.xsd">
- <artist> Some Singer
- </artist>
- <year> 1992 </year>
- <title> Lorem ipsum dolor </title>
- <lyrics>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- Nunc in nisi. Integer quis quam non eros accumsan elementum.
- Sed risus orci, lobortis at, pulvinar at, varius ac, neque.
- Morbi pede nulla, tincidunt ac, semper vel, ultricies vitae, lacus.
- Nunc nunc. </lyrics>
- <length>2</length>
- <album> Lorem ipsum dolor </album>
- <location> Raleigh, NC, USA </location>
-</song>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd
deleted file mode 100644
index cff977f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-whitespace.xsd
+++ /dev/null
@@ -1,28 +0,0 @@
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="song" type="xsdSong" />
- <!-- Define a simple type to test that the hierarchy overriding whitespace rule is observed -->
- <xsd:simpleType name="CollapsedString">
- <xsd:restriction base="xsd:string">
- <xsd:whiteSpace value="collapse" />
- </xsd:restriction>
- </xsd:simpleType>
- <!-- Define a simple type to test that the whitespace rule is inherited from the ancestor -->
- <xsd:simpleType name="Normalized">
- <xsd:restriction base="xsd:normalizedString"></xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="xsdSong">
- <xsd:sequence>
- <!-- Whitespace should be replaced -->
- <xsd:element name="artist" type="xsd:normalizedString" />
- <xsd:element name="year" type="xsd:nonNegativeInteger" />
- <!-- Whitespace should collapse -->
- <xsd:element name="title" type="xsd:token" />
- <!-- Whitespace should be preserved -->
- <xsd:element name="lyrics" type="xsd:string" />
- <!-- Whitespace should collapse -->
- <xsd:element name="length" type="xsd:duration" />
- <xsd:element name="album" type="CollapsedString" />
- <xsd:element name="location" type="Normalized" />
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl
deleted file mode 100644
index b75426e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext-fmt.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:template match="/">
- <html>
- <body>
- <h2>Space Checking</h2>
- <p>
- <xsl:attribute name="align">center</xsl:attribute>
- Check:
- <xsl:for-each select="text/item">
- <xsl:value-of select="something" />
- <xsl:if test="position()=last()-1">
- <xsl:text>trailing spaces </xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()-1">
- <xsl:text> leading spaces</xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()">
- <xsl:text>nospace</xsl:text>
- </xsl:if>
- </xsl:for-each>
- </p>
- </body>
- </html>
- </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl
deleted file mode 100644
index e87e387..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xslattributetext.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:template match="/">
-<html>
- <body>
- <h2>Space Checking</h2>
- <p><xsl:attribute name="align">center</xsl:attribute>Check:<xsl:for-each select="text/item"><xsl:value-of select="something"/>
- <xsl:if test="position()=last()-1">
- <xsl:text>trailing spaces </xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()-1">
- <xsl:text> leading spaces</xsl:text>
- </xsl:if>
- <xsl:if test="position()=last()">
- <xsl:text>nospace</xsl:text>
- </xsl:if>
- </xsl:for-each>
- </p>
- </body>
- </html>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
deleted file mode 100644
index 995f5ae..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-
-public class TestFragFile extends TestCase {
-
- public void testFrag() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- String testString1 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n" + "<!--This is an internally generated file - manual changes to it will be ignored and overwritten.-->\r\n" + "<Fragment parent=\"/ejb-jar/enterprise-beans<description,display-name,small-icon,large-icon\" destination=\"ejb-jar.xml\" type=\"xml\" xmlid=\"id,xmi:id\" tagSet=\"ejb\">\r\n" + "<session id=\"ejbs.TestBean\">\r\n" + "<ejb-name>Test</ejb-name>\r\n" + "<home>ejbs.TestHome</home>\r\n" + "<remote>ejbs.Test</remote>\r\n" + "<ejb-class>ejbs.TestBean</ejb-class>\r\n" + "<session-type>Stateless</session-type>\r\n" + "<transaction-type>Container</transaction-type>\r\n" + "</session>\r\n" + "</Fragment>";
-
-
- InputStream inputStream = new ByteArrayInputStream(testString1.getBytes("utf8"));
-
- model = modelManager.getModelForRead("test.frag", inputStream, null); //$NON-NLS-1$
-
- System.out.println(model);
- System.out.println(model.getStructuredDocument().get());
- }
-
- public void testFragX() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- String testString = "<!--This is an internally generated file - manual changes to it will be ignored and overwritten.-->\r\n" + "<Fragment parent=\"/ejb-jar/enterprise-beans<description,display-name,small-icon,large-icon\" destination=\"ejb-jar.xml\" type=\"xml\" xmlid=\"id,xmi:id\" tagSet=\"ejb\">\r\n" + "<session id=\"ejbs.TestBean\">\r\n" + "<ejb-name>Test</ejb-name>\r\n" + "<home>ejbs.TestHome</home>\r\n" + "<remote>ejbs.Test</remote>\r\n" + "<ejb-class>ejbs.TestBean</ejb-class>\r\n" + "<session-type>Stateless</session-type>\r\n" + "<transaction-type>Container</transaction-type>\r\n" + "</session>\r\n" + "</Fragment>";
-
-
- InputStream inputStream = new StringBufferInputStream(testString);
-
- model = modelManager.getModelForRead("test.fragx", inputStream, null); //$NON-NLS-1$
-
- System.out.println(model);
- System.out.println(model.getStructuredDocument().get());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
deleted file mode 100644
index f090d0f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestModelManager extends TestCase {
-
- private boolean isSetup = false;
-
- private final String fProjectName = "DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestModelManager() {
- super("TestModelManager");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- /**
- * must release after use!
- *
- * @return
- */
- private IStructuredModel getStructuredModelForEdit() {
- // from a file
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForEdit(f);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return model;
- }
-
- private IFile getFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
- }
-
- private IModelManager getMM() {
- return StructuredModelManager.getModelManager();
- }
-
- public void testCopyModel() {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- try {
- IStructuredModel modelCopy = getMM().copyModelForEdit(model.getId(), "newId");
- assertNotNull("copied model was null", modelCopy);
- }
- catch (ResourceInUse e) {
- e.printStackTrace();
- }
-
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateNewInstance() throws IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredModel newInstance = getMM().createNewInstance(model);
- assertTrue("failed to create new instance of: " + model, model != newInstance);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateNewStructuredDocumentFor() throws IOException, CoreException {
- IStructuredModel model = null;
- try {
- IFile file = getFile();
- // ensure model already exists
- model = getStructuredModelForEdit();
- boolean resourceExists = false;
- try {
- getMM().createNewStructuredDocumentFor(file);
- }
- catch(ResourceAlreadyExists ex) {
- resourceExists = true;
- }
- assertTrue("should have gotten ResourceAlreadyExits exception", resourceExists);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testCreateStructuredDocumentFor() throws IOException, ResourceAlreadyExists, CoreException {
- IStructuredModel model = null;
- try {
- IFile file = getFile();
- IStructuredDocument sDoc = getMM().createStructuredDocumentFor(file);
- assertNotNull("failed to create structured document", sDoc);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetExistingModelFromFile() throws IOException, CoreException {
- IFile f = getFile();
- IStructuredModel model = null;
- IStructuredModel existingModel = null;
- try {
- model = getStructuredModelForEdit();
- existingModel = StructuredModelManager.getModelManager().getExistingModelForEdit(f);
- assertNotNull("failed to get existing model", existingModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (existingModel != null)
- existingModel.releaseFromEdit();
-
- }
- }
-
- public void testGetExistingModelFromDocument() {
- IStructuredModel model = null;
- IStructuredModel gottenModel = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- gottenModel = getMM().getExistingModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (gottenModel != null)
- gottenModel.releaseFromEdit();
- }
- }
-
- public void testGetModelFromFile() throws IOException, CoreException {
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = StructuredModelManager.getModelManager().getModelForEdit(f);
- assertNotNull("failed to get model", model);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetModelFromDocument() {
- IStructuredModel model = null;
- IStructuredModel gottenModel = null;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- gottenModel = getMM().getModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (gottenModel != null)
- gottenModel.releaseFromEdit();
- }
- }
-
- public void testIsShared() {
- IStructuredModel model = null;
- IStructuredModel model2 = null;
- try {
- model = getStructuredModelForEdit();
- model2 = getStructuredModelForEdit();
- // TODO: will change when API added to MM
- boolean isShared = getMM().isShared(model.getId());
- assertTrue("model should be shared", isShared);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- if (model2 != null)
- model2.releaseFromEdit();
- }
- }
-
- public void testReinitialize() throws IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- getMM().reinitialize(model);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testReleaseModel() throws IOException {
- // TODO: will need to implement when MM has this function
- }
-
- public void testSaveModel() throws UnsupportedEncodingException, CoreException, IOException {
- IStructuredModel model = null;
- try {
- model = getStructuredModelForEdit();
- // TODO: will need to change when MM has this function
- model.save();
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testSaveModelIfNotShared() {
- // TODO: will need to implement when MM has this function
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index 7e5a48d..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.model;
-
-import java.io.IOException;
-import java.io.StringBufferInputStream;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xml.core.tests.document.UnzippedProjectTester;
-
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
- private static final String NONEXISTENT_FILENAME1 = "testfiles/xml/testnonexistent1.xml";
- private static final String NONEXISTENT_FILENAME2 = "testfiles/xml/testnonexistent2.xml";
- private static final String NONEXISTENT_FILENAME3 = "testfiles/xml/testnonexistent3.xml";
- private static final String EXISTENT_FILENAME1 = "testfiles/xml/testNormalCase.xml";
- private final static boolean DEBUG = false;
-
- public void testNonExistentFileWithBuffer() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateBuffer(NONEXISTENT_FILENAME1, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate(NONEXISTENT_FILENAME2, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLIDs() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateIDs(NONEXISTENT_FILENAME3, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate(EXISTENT_FILENAME1, BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- private void addContentsAndCreateFile(IFile file) throws CoreException {
- StringBufferInputStream stringStream = new StringBufferInputStream("testing testing testing");
- file.create(stringStream, false, null);
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestCreate(String filePath, Class class1, Class class2) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- // count as success if gets to heer without exception
- assertTrue(true);
- String fileLocation = model.getBaseLocation();
- String id = model.getId();
- if (DEBUG) {
- System.out.println("fileLocation: " + fileLocation);
- System.out.println("id: " + id);
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- private void doTestCreateBuffer(String filePath, Class class1, Class class2) throws CoreException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
-
- ITextFileBuffer fileBufferBeforeExists = getTextBuffer(file);
-
- addContentsAndCreateFile(file);
-
- ITextFileBuffer fileBufferAfterExists = getTextBuffer(file);
-
- boolean buffersIdentical = fileBufferBeforeExists == fileBufferAfterExists;
- assertTrue(buffersIdentical);
- if (DEBUG) {
- System.out.println(fileBufferBeforeExists.getLocation());
- System.out.println(fileBufferAfterExists.getLocation());
- }
-
-
-
- }
-
- private void doTestCreateIDs(String filePath, Class class1, Class class2) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
-
- try {
- assertNotNull(model);
- if (DEBUG) {
- System.out.println("ID: " + model.getId());
- System.out.println("BaseLocation" + model.getBaseLocation());
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private ITextFileBuffer getTextBuffer(IFile file) throws CoreException {
- ITextFileBufferManager fileBufferManager = FileBuffers.getTextFileBufferManager();
- IPath fileIPath = file.getFullPath();
- IPath normalizedPath = FileBuffers.normalizeLocation(fileIPath);
- fileBufferManager.connect(normalizedPath, null);
- ITextFileBuffer buffer = fileBufferManager.getTextFileBuffer(normalizedPath);
- return buffer;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
deleted file mode 100644
index a66d915..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredModel extends TestCase {
-
- private boolean isSetup = false;
-
-
- private final String fProjectName = "DOCUMENT-LOADER";
- // is it a problem to unzip the same project in
- // different tests?
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
- public TestStructuredModel() {
- super("TestStructuredModel");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if (!this.isSetup) {
-
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- public void testAboutToChangeModel() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.aboutToChangeModel();
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testAddRemoveModelStateListener() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IModelStateListener listener = new IModelStateListener() {
-
- public void modelAboutToBeChanged(IStructuredModel model) {
- //
- }
-
- public void modelChanged(IStructuredModel model) {
- //
- }
-
- public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
- //
- }
-
- public void modelResourceDeleted(IStructuredModel model) {
- //
- }
-
- public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
- //
- }
-
- public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
- //
- }
-
- public void modelReinitialized(IStructuredModel structuredModel) {
- //
- }
- };
-
- model.aboutToChangeModel();
-
- model.removeModelStateListener(listener);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- /**
- * Test expectes an exception since only a changedModel sent, without
- * beginning 'aboutToChangeModel'
- *
- * @throws CoreException
- * @throws IOException
- *
- */
- public void testChangedModel() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- try {
- model.changedModel();
- }
- catch (Exception e) {
- assertTrue(e instanceof IllegalStateException);
- }
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetContentType() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- String ct = model.getContentTypeIdentifier();
- assertTrue("model has wrong content type:" + ct + " != " + ContentTypeIdForXML.ContentTypeID_XML, ct.equals(ContentTypeIdForXML.ContentTypeID_XML));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetBaseLocation() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- String location = model.getBaseLocation();
- assertTrue("wrong base location", location.equals("/" + fProjectName + "/files/simple.xml"));
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- public void testGetFactoryRegistry() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.getFactoryRegistry();
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetIndexedRegion() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- model.getIndexedRegion(0);
- assertTrue(true);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testGetIndexedRegions() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- // not implemented yet...
- // model.getIndexedRegions();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testGetStructuredDocument() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredDocument doc = model.getStructuredDocument();
- assertNotNull("document is null", doc);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsDirty() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("model should not be dirty", model.isDirty());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsModelStateChanging() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("model should not be changing", model.isModelStateChanging());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsNew() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- // this API seems strange
- // assertFalse("new model check failed", model.isNew());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testIsReinitializationNeeded() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("reinitialization should not be needed", model.isReinitializationNeeded());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
-
- public void testIsSaveNeeded() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- assertFalse("save should not be needed", model.isSaveNeeded());
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testNewInstance() throws IOException, CoreException {
- IStructuredModel model = getTestModel();
- try {
- IStructuredModel newInstance = null;
- try {
- newInstance = model.newInstance();
- }
- catch (IOException e) {
- assertTrue("IOException during model new instance", false);
- }
- assertNotNull("new instance is null", newInstance);
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- /**
- * Be sure to release any models obtained from this method.
- *
- */
- IStructuredModel getTestModel() throws IOException, CoreException {
-
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
- IFile iFile = (IFile) project.findMember("/files/simple.xml");
- // fProjectName + "/files/simple.xml"
-
-
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- model = modelManager.getModelForEdit(iFile);
-
-
- return model;
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
deleted file mode 100644
index f468324..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.wst.xml.core.tests.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-/**
- *
- *
- */
-public class TestXMLModelLoader extends TestCase {
-
- private boolean isSetup = false;
- private XMLModelLoader fLoader = null;
-
- private final String fProjectName ="DOCUMENT-LOADER";
- private final String fZipFileName = "xml-document-loader-tests.zip";
-
-
- public TestXMLModelLoader() {
- super("TestModelLoader");
- }
-
- protected void setUp() throws Exception {
-
- super.setUp();
- if(!this.isSetup){
- fLoader = new XMLModelLoader();
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
- unzipUtil.initJavaProject(fProjectName);
- }
-
- public void testCreateEmptyModel() {
- IStructuredModel model = fLoader.createModel();
- assertNotNull("model is null", model);
- }
-
- public void testCreateModelWithDocument() {
- IStructuredModel emptyModel = fLoader.createModel();
- IStructuredDocument sDoc = emptyModel.getStructuredDocument();
- sDoc.set("<?xml version=\"1.0\"?>\n<test>\n<item attr=\"val\" /></test>\n");
-
- // null handlder is normally not valid, including only for this test.
- IStructuredModel modelFromDoc = fLoader.createModel(sDoc, "/test", null);
- assertNotNull("model from doc is null", modelFromDoc);
- }
-
- public void testCreateModelWithModel() {
- IStructuredModel emptyModel = fLoader.createModel();
- IStructuredDocument sDoc = emptyModel.getStructuredDocument();
- sDoc.set("<?xml version=\"1.0\"?>\n<test>\n<item attr=\"val\" /></test>\n");
- // TODO: need an existing full model
- //IStructuredModel modelFromModel = fLoader.createModel(emptyModel);
- //assertNotNull("model from model is null", modelFromModel);
- }
-
- public void testGetAdapterFactories() {
- List factories = fLoader.getAdapterFactories();
- assertTrue("there were no adapter factories for XML", factories.size() > 0);
- }
-
- public void testLoad() {
- // from a file
- IFile f = getFile();
-
- try {
- IStructuredModel model = fLoader.createModel();
- fLoader.load(f, model);
- String text = model.getStructuredDocument().get();
- assertTrue("failed to load", text.length() > 0);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- }
-
- public void testLoadFromStream() {
- // need to fix this test
- // unless the API is going away...
-// IFile f = getFile();
-//
-// try {
-// IStructuredModel model = fLoader.createModel();
-// fLoader.load(f.getContents(), model, EncodingRule.FORCE_DEFAULT);
-// String text = model.getStructuredDocument().get();
-// assertTrue("failed to load", text.length() > 0);
-// }
-// catch (IOException e) {
-// e.printStackTrace();
-// }
-// catch (CoreException e) {
-// e.printStackTrace();
-// }
- }
-
-
- private IFile getFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/range/TestRangeCompare.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/range/TestRangeCompare.java
deleted file mode 100644
index 61fcabc..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/range/TestRangeCompare.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.tests.range;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.w3c.dom.ranges.Range;
-
-public class TestRangeCompare extends TestCase {
- private static final String decl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; //$NON-NLS-1$
-
- public void testRangeCompare() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
-
- IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- model.getStructuredDocument().set(decl);
-
- Document document = model.getDocument();
- Element root = document.createElement("parent");//$NON-NLS-1$
- document.appendChild(root);
- Element child = document.createElement("child");//$NON-NLS-1$
- root.appendChild(child);
- child.appendChild(document.createElement("child1-1"));//$NON-NLS-1$
- Text textnode = document.createTextNode("Text Node");//$NON-NLS-1$
- root.appendChild(textnode);
- NodeList children = root.getElementsByTagName("child");//$NON-NLS-1$
-
- Range range = ((DocumentImpl)document).createRange();
- range.setEnd(children.item(0), 1);
-
- Range sourceRange = ((DocumentImpl)document).createRange();
- sourceRange.setEnd(textnode, 0);
- int result = range.compareBoundaryPoints(Range.END_TO_END, sourceRange);
-
- assertEquals(-1, result);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java
deleted file mode 100644
index 28f66ed..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
deleted file mode 100644
index ada17ef..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerXML extends TestCase {
-
- private boolean DEBUG_PRINT_RESULT = false;
- protected ITypedRegion[] partitions = null;
-
- private boolean useFormatter = true;
- protected DecimalFormat formatter;
-
- public TestStructuredPartitionerXML(String name) {
- super(name);
- if (DEBUG_PRINT_RESULT && useFormatter)
- formatter = new DecimalFormat();
- }
-
- /**
- * must release model (from edit) after
- * @param filename relative to this class (TestStructuredPartitioner)
- */
- private IStructuredModel getModelForEdit(String filename) {
-
- IStructuredModel model = null;
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- model = modelManager.getModelForEdit(filename, inStream, null);
- }
- catch (IOException ex) {
- ex.printStackTrace();
- }
- return model;
- }
-
- public void testDisconnectConnect() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- assertNotNull("partitioner was null for sDoc:" + sDoc, partitioner);
- try {
- stp.disconnect();
- }
- catch(Exception e) {
- assertTrue("problem disconnecting w/:" +sDoc + "/n" + e, false);
- }
- try {
- stp.connect(sDoc);
- }
- catch(Exception e) {
- assertTrue("problem connecting w/:" + sDoc + "/n" + e, false);
- }
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetDefaultPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testGetPartitionType() {
- IStructuredModel model = null;
- try {
- model =getModelForEdit("testfiles/xml/example01.xml");
- if(model != null) {
- IStructuredDocument sDoc = model.getStructuredDocument();
- assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-
- IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- assertTrue("paritioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-
- IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
- String defaultPartitionType = stp.getDefaultPartitionType();
- assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
- }
- else {
- assertTrue("could not retrieve structured model", false);
- }
- }
- finally {
- if(model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testXML1() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doComputePartitioningTest("testfiles/xml/example01.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_PI, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_COMMENT, IXMLPartitions.XML_DEFAULT});
- }
-
- public void testEmpty() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
- }
-
- public void testPerfXML() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doTimedComputePartitioningTest("testfiles/xml/company300k.xml");
- assertEquals("wrong number of partitions", expectedPartitions, nPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_PI, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_COMMENT, IXMLPartitions.XML_DEFAULT});
- }
-
- /**
- * Ensure that the current list of partitions are all adjacent to one another
- */
- protected void checkSeams() {
- if (partitions == null)
- return;
- int offset = 0;
- for (int i = 0; i < partitions.length; i++) {
- assertEquals("partitions are not contiguous!", offset, partitions[i].getOffset());
- offset = partitions[i].getOffset() + partitions[i].getLength();
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
-
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Retrieves the single partition at the given offset for the given file, using the
- * default partitioner for that file type. This test allows for verifying the zero-length
- * partitioning behavior.
- *
- * @param filename
- * @param offset
- * @return ITypedRegion
- * @throws IOException
- * @throws BadLocationException
- */
- protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- partitions = null;
- ITypedRegion partition = structuredDocument.getPartition(offset);
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- try {
- contents = structuredDocument.get(partition.getOffset(), partition.getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
- }
- model.releaseFromEdit();
- inStream.close();
-
- return partition;
- }
-
- /**
- * Verifies that the given partitions are of the given partition types
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
- for (int i = 0; i < expectedTypes.length; i++)
- assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
- }
-
- /**
- * Verifies that the given partitions begin at the given offsets
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
- for (int i = 0; i < offsets.length; i++) {
- assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
- if (i > 0) {
- assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
- }
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new NullStream();
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
- long startTime = System.currentTimeMillis();
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- long endTime = System.currentTimeMillis();
- if (DEBUG_PRINT_RESULT) {
-
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- System.out.println("Time to compute " + partitions.length + ": " + (endTime-startTime) + " (msecs)");
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml
deleted file mode 100644
index e2ba556..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml
+++ /dev/null
@@ -1,8100 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>The Ultimate A Company</title>
- </head>
- <body>
- <p>
- <img src="banner.gif" height="51" width="659" alt="" />
- </p>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <!-- comment added to tests 6 partitions -->
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art. </h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <p>
- <img src="footer.gif" height="25" width="659" alt="" />
- </p>
- </body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml
deleted file mode 100644
index f46ccee..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE testcase SYSTEM "testcase.dtd">
-<!-- this document will not validate -->
-<testcase></testcase>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd
deleted file mode 100644
index 6d44097..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml encoding="US-ASCII"?>
-<!-- ====================== Entities ==================================-->
-<!ENTITY % EdtPageSubCat "OutlineView | PropertySheet | SourceView">
-<!ENTITY % WebSubCat "Accessability | AnimGIFDesigner | AppServerConfig | CSSEditor | DBWizard | FTPImport | FTPExport | HTTPImport | JavaBeanWizard | LinkStyleConvWizard | LinksView | Miscellaneous | HTMLFileWizard | JSPFileWizard | ServletFileWizard | WebProjWizard | NLS | Samples | WebAppDeployDesc">
-<!ENTITY % HTMLSubCat "PageDesigner | DesignView | %EdtPageSubCat; | Preview">
-<!ENTITY % XMLSubCat "%EdtPageSubCat;">
-<!ENTITY % SubCat "(%WebSubCat; | %HTMLSubCat; | %XMLSubCat;)">
-<!ENTITY % Cat "(webtool | html | xml)">
-
-<!ENTITY % State "(Undefined | UnderConstruction | UnderReview | ReviewCompleted | Approved | Ready | Complete | Obsolete)">
-<!ENTITY % Bucket "(ComponentTest | ProductTest | IntegrationTest | TranslationTest | UnitTest)">
-<!ENTITY % Platform "(All | Win2000 | WinME | WinNT | Win98 | LinuxRedHat | Caldera | SuSe | TurboLinux)">
-
-<!-- ====================== Elements ================================-->
-<!ELEMENT testcase
- ((header, summary, definition, execution*),variation*)>
-<!ELEMENT variation
- (header, summary, definition, execution*)>
-
-<!ELEMENT header (subject, author, coauthor*, creation_date)>
-<!ELEMENT subject (#PCDATA)>
-<!ELEMENT author (#PCDATA)>
-<!ELEMENT coauthor (#PCDATA)>
-<!ELEMENT creation_date (#PCDATA)>
-
-<!-- Example of having more than one attribute list defined for a given element -->
-<!ATTLIST header
- number ID #REQUIRED
- state %State; "UnderConstruction"
->
-<!ATTLIST header
- category %Cat; #REQUIRED
- subCategory %SubCat; #REQUIRED
- subSubCateogory CDATA #IMPLIED
- >
-
-<!ELEMENT summary (testBucket+, platform+, part*, release+)>
-<!ELEMENT testBucket EMPTY>
-<!ATTLIST testBucket
- type %Bucket; #REQUIRED
->
-<!ELEMENT platform EMPTY>
-<!ATTLIST platform
- type %Platform; #REQUIRED
->
-<!ELEMENT part (#PCDATA)>
-<!ELEMENT release (#PCDATA)>
-
-
-<!ELEMENT definition (purpose, prerequisite*, procedure, expected_results)>
-<!ELEMENT purpose (#PCDATA)>
-<!ELEMENT prerequisite EMPTY>
-<!ATTLIST prerequisite
- number IDREF #REQUIRED
->
-<!ELEMENT procedure (#PCDATA)>
-<!ELEMENT expected_results (#PCDATA)>
-
-<!ELEMENT execution ANY>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java
deleted file mode 100644
index 5a779d9..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the 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.tests.util;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.wst.xml.core.tests.Logger;
-import org.w3c.dom.Document;
-
-
-
-/**
- */
-public class CommonXML {
-
- public synchronized static DocumentBuilder getDocumentBuilder() {
- DocumentBuilder result = null;
- try {
- result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
- DocumentBuilder result = null;
- try {
- DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
- instance.setValidating(validating);
- result = instance.newDocumentBuilder();
- }
- catch (ParserConfigurationException e) {
- Logger.logException(e);
- }
- return result;
- }
-
- public static void serialize(Document document, OutputStream ostream) throws IOException {
- Source domSource = new DOMSource(document);
- try {
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- try {
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
- }
- catch (IllegalArgumentException e) {
- // unsupported properties
- }
- serializer.transform(domSource, new StreamResult(ostream));
- }
- catch (TransformerConfigurationException e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerFactoryConfigurationError e) {
- throw new IOException(e.getMessage());
- }
- catch (TransformerException e) {
- throw new IOException(e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
deleted file mode 100644
index 61d885e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
- /**
- * Constructor for AllTests.
- * @param name
- */
- private static String now = null;
-
-
- public static String now() {
- // just calculate once, so whole run as same timestamp
- if (DateUtil.now == null) {
- DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
- Calendar calendar = Calendar.getInstance();
- Date today = calendar.getTime();
- DateUtil.now = format.format(today);
- }
- return DateUtil.now;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
deleted file mode 100644
index cc3d4cd..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.util;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
- public static String XML_CORE_TESTS_PLUGIN_ID = "org.eclipse.wst.xml.core.tests";
-
- static File previousResultsDirectory = null;
- static private String logSubDirectoryPath;
-
- private static boolean notTriedYet = true;
-
- public static class DirFilenameFilter implements FilenameFilter {
- String startOfAcceptableNames;
-
- public DirFilenameFilter(String startOfDirName) {
- startOfAcceptableNames = startOfDirName;
- }
-
- /**
- * @see java.io.FileFilter#accept(File)
- */
- public boolean accept(File pathname, String filename) {
- // we'll just assume if it starts with right key, it is a directory ... for now
- return filename.startsWith(startOfAcceptableNames);
- }
-
- }
-
- public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
- if (previousResultsDirectory == null && notTriedYet) {
- Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- //String installPath = url.getPath();
- // add known file so URL method below can be used
- // (doesn't seem to work for directory?)
- URL totalURL = new URL(url, "plugin.xml");
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File pluginHomeDir = new File(finalPath);
- FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
- File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
- // assume first in list is newest, then start looking with the
- // second item ... just to avoid "null" case checking
- if (allDirs.length > 0) {
- File currentNewest = allDirs[0];
- for (int i = 1; i < allDirs.length; i++) {
- File current = allDirs[i];
- // NOTE: we go by modified date, not by the actual time stamp in name.
- // This should work for all normal cases, but may not if someone does some
- // "funny" copying, or updating from repository.
- if (current.lastModified() > currentNewest.lastModified()) {
- currentNewest = current;
- }
- }
- previousResultsDirectory = currentNewest;
- }
- notTriedYet = false;
- }
- return previousResultsDirectory;
- }
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
- URL url = bundle.getEntry("/");
- URL localURL = FileLocator.toFileURL(url);
- String installPath = localURL.getPath();
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- //URL finalurl = Platform.asLocalURL(totalURL);
- String finalFile = totalURL.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!dir.exists()) {
- // a little safety net, be sure the previous newest directory
- // is initialized, just in case no one else has done so
- if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
- FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
- }
- // now its "safe" to make the new one
- dir.mkdirs();
- }
- return file;
- }
-
- /**
- * Just a general utility method
- * @param filename
- * @return String
- */
- public static String getExtension(String filename) {
- String extension = null;
- int dotPostion = filename.lastIndexOf('.');
- if (dotPostion > -1) {
- extension = filename.substring(dotPostion + 1);
- }
- else {
- extension = new String();
- }
- return extension;
- }
-
- /**
- * General purpose utility method to ensure the log
- * directory exists, and returns the name.
- */
- public static String getLogDirectory() {
- if (logSubDirectoryPath == null) {
- String mainDirectory = "/logs";
- File dir = new File(mainDirectory);
- ensureExists(dir);
- String subDirectory = TimestampUtil.timestamp();
- logSubDirectoryPath = mainDirectory + "/" + subDirectory;
- File subdir = new File(logSubDirectoryPath);
- ensureExists(subdir);
- }
- return logSubDirectoryPath;
- }
-
- public static void ensureExists(File dir) {
- if (!dir.exists()) {
- dir.mkdirs();
- }
- }
-
- public static String getPerformanceOutputLogName() {
- String result = null;
- String directoryName = FileUtil.getLogDirectory();
- String extension = ".out";
- String baseName = "sedTests";
- long now = System.currentTimeMillis();
- String nowStr = String.valueOf(now);
- result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java
deleted file mode 100644
index 28105a7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- *
- * @author pavery
- */
-public class ProjectUnzipUtility {
- class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // noop
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // noop
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // noop
- }
-
- public void subTask(String name) {
- // noop
- }
-
- public void worked(int work) {
- // noop
- }
- }
-
- class MyOverwriteQuery implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- }
-
- public final static String PROJECT_ZIPS_FOLDER = "projecttestfiles";
- private List fCreatedProjects = null;
-
- public ProjectUnzipUtility() {
- // for deletion later
- fCreatedProjects = new ArrayList();
- }
-
- /**
- * @param fileToImport
- * the file you wish to import
- * @param folderPath
- * the container path within the workspace
- */
- public void importFile(File fileToImport, String folderPath) {
- WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
- try {
- if (fileToImport.exists()) {
- IPath containerPath = new Path(folderPath);
- //fCreatedProjects.add(folderPath);
- IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
- IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
- File[] filesToImport = {fileToImport};
- ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
- importOp.setCreateContainerStructure(false);
- importOp.setOverwriteResources(true);
- importOp.run(importProgress);
- }
- else {
- System.out.println("handle source doesn't exist");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- finally {
- importProgress.done();
- }
- }
-
- /**
- * the following is logic from
- * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
- */
- // specify buffer size for extraction
- static final int BUFFER = 2048;
-
- public void unzipAndImport(File inFile, String destinationDirectory) {
- try {
- // Specify file to decompress
- String inFileName = inFile.getAbsolutePath(); //"c:/example.zip";
- // Specify destination where file will be unzipped
- //String destinationDirectory =
- // "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
- File sourceZipFile = new File(inFileName);
- File unzipDestinationDirectory = new File(destinationDirectory);
- // Open Zip file for reading
- ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
- // Create an enumeration of the entries in the zip file
- Enumeration zipFileEntries = zipFile.entries();
- String projectFolderName = null;
- IProject currentProject = null;
- // Process each entry
- while (zipFileEntries.hasMoreElements()) {
- // grab a zip file entry
- ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
- String currentEntry = entry.getName();
- //System.out.println("Extracting: " + entry);
- File destFile = new File(unzipDestinationDirectory, currentEntry);
- // grab file's parent directory structure
- File destinationParent = destFile.getParentFile();
- // create the parent directory structure if needed
- destinationParent.mkdirs();
- // extract file if not a directory
- if (!entry.isDirectory()) {
- BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
- int currentByte;
- // establish buffer for writing file
- byte data[] = new byte[BUFFER];
- // write the current file to disk
- FileOutputStream fos = new FileOutputStream(destFile);
- BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER);
- // read and write until last byte is encountered
- while ((currentByte = is.read(data, 0, BUFFER)) != -1) {
- dest.write(data, 0, currentByte);
- }
- dest.flush();
- dest.close();
- is.close();
- if (projectFolderName != null)
- importFile(destFile, projectFolderName);
- }
- else {
- // need handle to the main project folder to create
- // containerPath
- // unlike version in sse.tests, we don't create project
- // for
- // every directory
- // if(projectFolderName == null) {
- // projectFolderName = destFile.getName();
- // fCreatedProjects.add(projectFolderName);
- //
- // currentProject =
- // ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
- // }
- }
- }
- zipFile.close();
- // fixes workspace metadata for the project
- // for clean startup next run
- if (currentProject != null) {
- try {
- Path projectLocation = new Path(Platform.getLocation().toOSString());
- createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
- }
- catch (CoreException cex) {
- cex.printStackTrace();
- }
- }
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
- /**
- *
- */
- public void refreshWorkspace() throws CoreException {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = wsRoot.getProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- /**
- * Delete projects created (unzipped and imported) by this utility
- *
- * @throws Exception
- */
- public void deleteProjects() throws Exception {
- final IProject[] projects = getCreatedProjects();
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < projects.length; i++) {
- projects[i].clearHistory(null);
- projects[i].close(null);
- projects[i].delete(true, true, null);
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- public void deleteProject(String projectName) throws Exception {
- final String name = projectName;
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- final IProject proj = wsRoot.getProject(name);
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- try {
- proj.delete(true, true, null);
- }
- catch (Exception e) {
- // just try again (not sure why they are not being
- // deleted)
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- }
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- /**
- * @return IProjects that were unzipped and imported into the workspace by
- * this utility
- */
- public IProject[] getCreatedProjects() {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
- IProject[] projects = new IProject[projectNames.length];
- for (int i = 0; i < projectNames.length; i++) {
- projects[i] = wsRoot.getProject(projectNames[i]);
- }
- return projects;
- }
-
- public void initJavaProject(String projName) throws CoreException {
- // resynch
- refreshWorkspace();
- //change prereqs to get this functionality back in
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- if (!proj.exists()) {
- proj.create(new NullProgressMonitor());
- }
- // need to add java nature, or else project won't "exist()" in the
- // java
- // element sense
- String[] natureIds = {"org.eclipse.jdt.core.javanature"};
- if (!proj.isOpen()) {
- proj.open(null);
- }
- IProjectDescription desc = proj.getDescription();
- desc.setNatureIds(natureIds);
- proj.setDescription(desc, new NullProgressMonitor());
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new WorkspaceProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
- final IProject proj = fProject;
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- //WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(null);
- // saves the new workspace metadata
- //ResourcesPlugin.getWorkspace().save(true, null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index eb59c82..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
- public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
- if (string1 == null)
- return false;
- if (string2 == null)
- return false;
-
- StringReader s1Reader = new StringReader(string1);
- StringReader s2Reader = new StringReader(string2);
-
- // assume true unless find evidence to the contrary
- boolean result = true;
- int s1Char = -1;
- int s2Char = -1;
- do {
-
- s1Char = getNextChar(s1Reader);
-
- s2Char = getNextChar(s2Reader);
-
- if (s1Char != s2Char) {
- result = false;
- break;
- }
- }
- while (s1Char != -1 && s2Char != -1);
-
- return result;
- }
-
- /**
- * Method getNextChar.
- * @param s1Reader
- * @return char
- */
- private int getNextChar(StringReader reader) {
- int nextChar = -1;
- try {
- nextChar = reader.read();
- while (isEOL(nextChar)) {
- nextChar = reader.read();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- return nextChar;
- }
-
- private boolean isEOL(int aChar) {
- return (aChar == '\n' || aChar == '\r');
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
deleted file mode 100644
index 8a471da..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.util;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
- private static Date timestamp = null;
- private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
- // private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
- private static String nowShort = null;
-
- public static String timestamp() {
-
- if (TimestampUtil.nowShort == null) {
- TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
- }
- return TimestampUtil.nowShort;
- }
-
- protected static Date ensureTimestamp() {
- // just calculate 'timestamp' once per class loading,
- // so this 'timestamp' remains the same during
- // entire run.
- if (TimestampUtil.timestamp == null) {
- Calendar calendar = Calendar.getInstance();
- TimestampUtil.timestamp = calendar.getTime();
- }
- return TimestampUtil.timestamp;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/test.xml b/tests/org.eclipse.wst.xml.core.tests/test.xml
deleted file mode 100644
index d021aae..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/testfiles.zip b/tests/org.eclipse.wst.xml.core.tests/testfiles.zip
deleted file mode 100644
index 084f332..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/testfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.classpath b/tests/org.eclipse.wst.xml.tests.encoding/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.classpath
+++ /dev/null
@@ -1,11 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore b/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore
deleted file mode 100644
index 67968bd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
-javaCompiler.tests.jar.args
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.project b/tests/org.eclipse.wst.xml.tests.encoding/.project
deleted file mode 100644
index 6ac370c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.tests.encoding</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.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.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.tests.encoding/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 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=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-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=error
-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=error
-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=ignore
-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.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.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.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-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.tests.encoding/LargeNoEncoding.html b/tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 65c7cdb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.tests.encoding
-Bundle-Version: 1.0.500.qualifier
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.wst.xml.tests.encoding.TestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.xml.tests.encoding.pref,
- org.eclipse.wst.xml.tests.encoding.properties,
- org.eclipse.wst.xml.tests.encoding.read,
- org.eclipse.wst.xml.tests.encoding.util,
- org.eclipse.wst.xml.tests.encoding.write,
- org.eclipse.wst.xml.tests.encoding.xml
-Require-Bundle: org.eclipse.core.resources,
- org.junit;bundle-version=3.8.2,
- org.eclipse.ui,
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide,
- org.eclipse.wst.xml.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.sse.core
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/about.html b/tests/org.eclipse.wst.xml.tests.encoding/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/build.properties b/tests/org.eclipse.wst.xml.tests.encoding/build.properties
deleted file mode 100644
index 8d554ab..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 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
-###############################################################################
-bin.includes = tests.jar,\
- testfiles/,\
- testfiles.zip,\
- test.xml,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.tests.jar = src/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt b/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt
deleted file mode 100644
index adfb1d2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt
+++ /dev/null
@@ -1,857 +0,0 @@
-
-Current Locale: en_US
-
-JRE version: J2RE 1.4.2 IBM Windows 32 build cndev-20040128 (JIT enabled: jitc)
--- listing properties --
-java.assistive=ON
-java.runtime.name=Java(TM) 2 Runtime Environment, Stand...
-sun.boot.library.path=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.vm.version=1.4.2
-java.vm.vendor=IBM Corporation
-java.vendor.url=http://www.ibm.com/
-path.separator=;
-java.vm.name=Classic VM
-file.encoding.pkg=sun.io
-user.country=US
-sun.os.patch.level=Service Pack 1
-java.vm.specification.name=Java Virtual Machine Specification
-user.dir=D:\builds\Daily\eclipse-SDK-I20040304...
-java.runtime.version=1.4.2
-java.fullversion=J2RE 1.4.2 IBM Windows 32 build cndev...
-java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment
-java.endorsed.dirs=D:\builds\Daily\wswb-SDK-I20040226-wi...
-os.arch=x86
-java.io.tmpdir=C:\DOCUME~1\DAVIDW~1.DMW\LOCALS~1\Temp\
-line.separator=
-
-java.vm.specification.vendor=Sun Microsystems Inc.
-user.variant=
-java.awt.fonts=
-os.name=Windows XP
-sun.java2d.fontpath=
-java.library.path=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.specification.name=Java Platform API Specification
-java.class.version=48.0
-ibm.system.encoding=Cp1252
-java.util.prefs.PreferencesFactory=java.util.prefs.WindowsPreferencesFac...
-invokedviajava=
-os.version=5.1
-user.home=C:\Documents and Settings\davidw.DMW2T23
-user.timezone=
-java.awt.printerjob=sun.awt.windows.WPrinterJob
-java.specification.version=1.4
-file.encoding=Cp1252
-user.name=davidw
-java.class.path=D:\builds\Daily\eclipse-SDK-I20040304...
-java.vm.specification.version=1.0
-sun.arch.data.model=32
-java.home=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.specification.vendor=Sun Microsystems Inc.
-user.language=en
-awt.toolkit=sun.awt.windows.WToolkit
-java.vm.info=J2RE 1.4.2 IBM Windows 32 build cndev...
-java.version=1.4.2
-java.ext.dirs=D:\builds\Daily\wswb-SDK-I20040226-wi...
-sun.boot.class.path=D:\builds\Daily\wswb-SDK-I20040226-wi...
-java.vendor=IBM Corporation
-file.separator=\
-java.vendor.url.bug=
-java.compiler=jitc
-sun.io.unicode.encoding=UnicodeLittle
-Available Locales
-ar
-ar_AE
-ar_BH
-ar_DZ
-ar_EG
-ar_IQ
-ar_JO
-ar_KW
-ar_LB
-ar_LY
-ar_MA
-ar_OM
-ar_QA
-ar_SA
-ar_SD
-ar_SY
-ar_TN
-ar_YE
-be
-be_BY
-bg
-bg_BG
-bn_IN
-ca
-ca_ES
-ca_ES_PREEURO
-cs
-cs_CZ
-da
-da_DK
-da_DK_EURO
-de
-de_AT
-de_AT_PREEURO
-de_CH
-de_DE
-de_DE_PREEURO
-de_LU
-de_LU_PREEURO
-el
-el_GR
-el_GR_PREEURO
-en
-en_AU
-en_BE
-en_BE_PREEURO
-en_CA
-en_GB
-en_GB_EURO
-en_HK
-en_IE
-en_IE_PREEURO
-en_IN
-en_NZ
-en_PH
-en_SG
-en_US
-en_ZA
-es
-es_AR
-es_BO
-es_CL
-es_CO
-es_CR
-es_DO
-es_EC
-es_ES
-es_ES_PREEURO
-es_GT
-es_HN
-es_MX
-es_NI
-es_PA
-es_PE
-es_PR
-es_PY
-es_SV
-es_US
-es_UY
-es_VE
-et
-et_EE
-fi
-fi_FI
-fi_FI_PREEURO
-fr
-fr_BE
-fr_BE_PREEURO
-fr_CA
-fr_CH
-fr_FR
-fr_FR_PREEURO
-fr_LU
-fr_LU_PREEURO
-gu
-gu_IN
-hi
-hi_IN
-hr
-hr_HR
-hu
-hu_HU
-in
-in_ID
-is
-is_IS
-it
-it_CH
-it_IT
-it_IT_PREEURO
-iw
-iw_IL
-ja
-ja_JP
-kk
-kk_KZ
-kn
-kn_IN
-ko
-kok_IN
-ko_KR
-lt
-lt_LT
-lv
-lv_LV
-mk
-mk_MK
-ml_IN
-mr
-mr_IN
-ms
-ms_MY
-nb_NO
-nl
-nl_BE
-nl_BE_PREEURO
-nl_NL
-nl_NL_PREEURO
-no
-no_NO
-no_NO_NY
-or_IN
-pa
-pa_IN
-pl
-pl_PL
-pt
-pt_BR
-pt_PT
-pt_PT_PREEURO
-ro
-ro_RO
-ru
-ru_RU
-sa
-sa_IN
-sh
-sh_YU
-sk
-sk_SK
-sl
-sl_SI
-sq
-sq_AL
-sr
-sr_YU
-sv
-sv_SE
-sv_SE_EURO
-ta
-ta_IN
-te
-te_IN
-th
-th_TH
-th_TH_TH
-tr
-tr_TR
-uk
-uk_UA
-vi
-vi_VN
-zh
-zh_CN
-zh_CN_HK
-zh_HK
-zh_SG
-zh_TW
-file.encoding.pkg: sun.io
-file.encoding: Cp1252
-
-
-Available Charsets
-1. Charsetname: Big5
- displayName: Big5: PC Taiwan Big 5
- aliases: [big5, Big5-HKSCS]
-2. Charsetname: CESU-8
- displayName: CESU-8: Unicode UTF-8 (without surrogates)
- aliases: [CESU8]
-3. Charsetname: COMPOUND_TEXT
- displayName: COMPOUND_TEXT: X11 Compound Text
- aliases: [x-compound-text, x11-compound-text]
-4. Charsetname: EUC-CN
- displayName: EUC-CN: EUC China
- aliases: [euc_cn, euccn, ibm-euccn]
-5. Charsetname: EUC-JP
- displayName: EUC-JP: EUC Japan
- aliases: [euc-jp-linux, x-euc-jp, x-eucjp, euc_jp_linux, eucjp, euc_jp]
-6. Charsetname: EUC-KR
- displayName: EUC-KR: EUC Korea
- aliases: [5601, ksc5601_1987, ksc_5601, ibm-euckr, ksc5601-1987, ibm-970, euc_kr, Cp970, ks_c_5601-1987, euckr]
-7. Charsetname: EUC-TW
- displayName: EUC-TW: EUC Taiwan
- aliases: [euc_tw, cns11643, euctw]
-8. Charsetname: GB18030
- displayName: GB18030: PC China GB18030
- aliases: [windows-54936, ibm-1392, gb18030-2000]
-9. Charsetname: GB2312
- displayName: GB2312
- aliases: [gb2312-80, gb2312-1980]
-10. Charsetname: GBK
- displayName: GBK: PC China GBK
- aliases: [GBK]
-11. Charsetname: hp-roman8
- displayName: hp-roman8: HP Roman 8
- aliases: [Cp1051, ibm-1051, roman8, r8]
-12. Charsetname: IBM-037
- displayName: IBM-037: EBCDIC United States
- aliases: [ibm-37]
-13. Charsetname: IBM-1006
- displayName: IBM-1006: ISO Urdu
- aliases: [ibm1006, Cp1006]
-14. Charsetname: IBM-1025
- displayName: IBM-1025: EBCDIC Cyrillic
- aliases: [ibm1025, Cp1025]
-15. Charsetname: IBM-1026
- displayName: IBM-1026: EBCDIC Latin 5 (Turkey)
- aliases: [Cp1026, ibm1026]
-16. Charsetname: IBM-1027
- displayName: IBM-1027: EBCDIC SBCS Japan
- aliases: [ibm1027, Cp1027]
-17. Charsetname: IBM-1041
- displayName: IBM-1041: PC SBCS-only Japan
- aliases: [Cp1041, ibm1041]
-18. Charsetname: IBM-1043
- displayName: IBM-1043: PC SBCS-only Taiwan
- aliases: [Cp1043, ibm1043]
-19. Charsetname: IBM-1046
- displayName: IBM-1046: EBCDIC Arabic
- aliases: [ibm1046, Cp1046]
-20. Charsetname: IBM-1046S
- displayName: IBM-1046S: EBCDIC Arabic (shaped)
- aliases: [Cp1046S, ibm1046S]
-21. Charsetname: IBM-1047
- displayName: IBM-1047: EBCDIC Open Edition
- aliases: [Cp1047, ibm1047]
-22. Charsetname: IBM-1088
- displayName: IBM-1088: PC SBCS-only Korean KS
- aliases: [Cp1088, ibm1088]
-23. Charsetname: IBM-1097
- displayName: IBM-1097: EBCDIC Farsi
- aliases: [Cp1097, ibm1097]
-24. Charsetname: IBM-1098
- displayName: IBM-1098: ISO Farsi
- aliases: [Cp1098, ibm1098]
-25. Charsetname: IBM-1112
- displayName: IBM-1112: EBCDIC Baltic
- aliases: [Cp1112, ibm1112]
-26. Charsetname: IBM-1114
- displayName: IBM-1114: PC SBCS-only Taiwan
- aliases: [Cp1114, ibm1114]
-27. Charsetname: IBM-1115
- displayName: IBM-1115: PC SBCS-only China
- aliases: [Cp1115, ibm1115]
-28. Charsetname: IBM-1122
- displayName: IBM-1122: EBCDIC Estonia
- aliases: [Cp1122, ibm1122]
-29. Charsetname: IBM-1123
- displayName: IBM-1123: EBCDIC Ukraine
- aliases: [Cp1123, ibm1123]
-30. Charsetname: IBM-1124
- displayName: IBM-1124: PC Ukraine
- aliases: [Cp1124, ibm1124]
-31. Charsetname: IBM-1140
- displayName: IBM-1140: EBCDIC United States (euro)
- aliases: [Cp1140, ibm1140]
-32. Charsetname: IBM-1141
- displayName: IBM-1141: EBCDIC Germany (euro)
- aliases: [Cp1141, ibm1141]
-33. Charsetname: IBM-1142
- displayName: IBM-1142: EBCDIC Denmark, Norway (euro)
- aliases: [Cp1142, ibm1142]
-34. Charsetname: IBM-1143
- displayName: IBM-1143: EBCDIC Finland, Sweden (euro)
- aliases: [ibm1143, Cp1143]
-35. Charsetname: IBM-1144
- displayName: IBM-1144: EBCDIC Italy (euro)
- aliases: [Cp1144, ibm1144]
-36. Charsetname: IBM-1145
- displayName: IBM-1145: EBCDIC Spain (euro)
- aliases: [ibm1145, Cp1145]
-37. Charsetname: IBM-1146
- displayName: IBM-1146: EBCDIC UK, Ireland (euro)
- aliases: [Cp1146, ibm1146]
-38. Charsetname: IBM-1147
- displayName: IBM-1147: EBCDIC France (euro)
- aliases: [Cp1147, ibm1147]
-39. Charsetname: IBM-1148
- displayName: IBM-1148: EBCDIC Multilingual (euro)
- aliases: [Cp1148, ibm1148]
-40. Charsetname: IBM-1149
- displayName: IBM-1149: EBCDIC Iceland
- aliases: [Cp1149, ibm1149]
-41. Charsetname: IBM-1351
- displayName: IBM-1351: PC DBCS-only Japan
- aliases: [Cp1351, ibm1351]
-42. Charsetname: IBM-1362
- displayName: IBM-1362: PC DBCS-only Korea KS extended
- aliases: [Cp1362, ibm1362]
-43. Charsetname: IBM-1363
- displayName: IBM-1363: PC Korea KS extended
- aliases: [Cp1363, ibm1363]
-44. Charsetname: IBM-1363C
- displayName: IBM-1363C: PC Korea KS extended (syntax)
- aliases: [ibm1363C, Cp1363C]
-45. Charsetname: IBM-1364
- displayName: IBM-1364: EBCDIC Korea KS extended
- aliases: [ibm1364, Cp1364]
-46. Charsetname: IBM-1370
- displayName: IBM-1370: PC Taiwan (euro)
- aliases: [Cp1370, ibm1370]
-47. Charsetname: IBM-1371
- displayName: IBM-1371: EBCDIC Taiwan (euro)
- aliases: [Cp1371, ibm1371]
-48. Charsetname: IBM-1380
- displayName: IBM-1380: PC DBCS-only China GB
- aliases: [ibm1380, Cp1380]
-49. Charsetname: IBM-1381
- displayName: IBM-1381: PC China GB
- aliases: [Cp1381, ibm1381]
-50. Charsetname: IBM-1382
- displayName: IBM-1382: EUC DBCS-only China GB
- aliases: [ibm1382, Cp1382]
-51. Charsetname: IBM-1383
- displayName: IBM-1383: EUC China
- aliases: [Cp1383, ibm1383]
-52. Charsetname: IBM-1385
- displayName: IBM-1385: PC DBCS-only China GBK
- aliases: [Cp1385, ibm1385]
-53. Charsetname: IBM-1386
- displayName: IBM-1386: PC China GBK
- aliases: [Cp1386, ibm1386]
-54. Charsetname: IBM-1388
- displayName: IBM-1388: EBCDIC China GBK
- aliases: [ibm1388, Cp1388]
-55. Charsetname: IBM-1390
- displayName: IBM-1390: EBCDIC Japan Katakana (euro)
- aliases: [Cp1390, ibm1390]
-56. Charsetname: IBM-1399
- displayName: IBM-1399: EBCDIC Japan Latin (euro)
- aliases: [Cp1399, ibm1399]
-57. Charsetname: IBM-273
- displayName: IBM-273: EBCDIC Germany
- aliases: [ibm273, Cp273]
-58. Charsetname: IBM-277
- displayName: IBM-277: EBCDIC Denmark, Norway
- aliases: [Cp277, ibm277]
-59. Charsetname: IBM-278
- displayName: IBM-278: EBCDIC Finland, Sweden
- aliases: [ibm278, Cp278]
-60. Charsetname: IBM-280
- displayName: IBM-280: EBCDIC Italy
- aliases: [ibm280, Cp280]
-61. Charsetname: IBM-284
- displayName: IBM-284: EBCDIC Spain, Latin America
- aliases: [Cp284, ibm284]
-62. Charsetname: IBM-285
- displayName: IBM-285: EBCDIC UK, Ireland
- aliases: [Cp285, ibm285]
-63. Charsetname: IBM-290
- displayName: IBM-290: EBCDIC SBCS Japan Katakana
- aliases: [Cp290, ibm290]
-64. Charsetname: IBM-297
- displayName: IBM-297: EBCDIC France
- aliases: [Cp297, ibm297]
-65. Charsetname: IBM-300
- displayName: IBM-300: EBCDIC DBCS-only Japan
- aliases: [Cp300, ibm300]
-66. Charsetname: IBM-301
- displayName: IBM-301: PC DBCS-only Japan
- aliases: [ibm301, Cp301]
-67. Charsetname: IBM-33722
- displayName: IBM-33722: EUC Japan
- aliases: [Cp33722, ibm33722]
-68. Charsetname: IBM-33722C
- displayName: IBM-33722C: EUC Japan syntax
- aliases: [ibm33722C, Cp33722C]
-69. Charsetname: IBM-420
- displayName: IBM-420: EBCDIC Arabic
- aliases: [Cp420, ibm420]
-70. Charsetname: IBM-420S
- displayName: IBM-420S: EBCDIC Arabic shaped
- aliases: [Cp420S, ibm420S]
-71. Charsetname: IBM-424
- displayName: IBM-424: EBCDIC Hebrew
- aliases: [ibm424, Cp424]
-72. Charsetname: IBM-437
- displayName: IBM-437: PC United States
- aliases: [Cp437, cspc8codepage437, ibm437]
-73. Charsetname: IBM-500
- displayName: IBM-500: EBCDIC Latin 1
- aliases: [ibm500, Cp500]
-74. Charsetname: IBM-737
- displayName: IBM-737: MS-DOS Greek
- aliases: [ibm737, Cp737]
-75. Charsetname: IBM-775
- displayName: IBM-775: MS-DOS Baltic Rim
- aliases: [ibm775, Cp775]
-76. Charsetname: IBM-808
- displayName: IBM-808: PC Russian (euro)
- aliases: [ibm808, Cp808]
-77. Charsetname: IBM-833
- displayName: IBM-833: EBCDIC SBCS Korean
- aliases: [ibm833, Cp833]
-78. Charsetname: IBM-834
- displayName: IBM-834: EBCDIC DBCS-only Korean
- aliases: [Cp834, ibm834]
-79. Charsetname: IBM-835
- displayName: IBM-835: EBCDIC DBCS-only Taiwan
- aliases: [Cp835, ibm835]
-80. Charsetname: IBM-836
- displayName: IBM-836: EBCDIC SBCS China
- aliases: [Cp836, ibm836]
-81. Charsetname: IBM-837
- displayName: IBM-837: EBCDIC DBCS-only China
- aliases: [Cp837, ibm837]
-82. Charsetname: IBM-838
- displayName: IBM-838: EBCDIC Thai
- aliases: [Cp838, ibm838]
-83. Charsetname: IBM-850
- displayName: IBM-850: PC Latin 1
- aliases: [cspc850multilingual, Cp850, ibm850]
-84. Charsetname: IBM-852
- displayName: IBM-852: PC Latin 2
- aliases: [Cp852, cspcp852, ibm852]
-85. Charsetname: IBM-855
- displayName: IBM-855: PC Cyrillic
- aliases: [Cp855, ibm855]
-86. Charsetname: IBM-856
- displayName: IBM-856: PC Hebrew (old)
- aliases: [Cp856, ibm856]
-87. Charsetname: IBM-857
- displayName: IBM-857: PC Latin 5
- aliases: [csibm857, ibm857, Cp857]
-88. Charsetname: IBM-858
- displayName: IBM-858: PC Latin 1 (euro)
- aliases: [Cp858, ibm858]
-89. Charsetname: IBM-859
- displayName: IBM-859: PC Latin 9
- aliases: [Cp859, ibm859]
-90. Charsetname: IBM-860
- displayName: IBM-860: PC Portugal
- aliases: [ibm860, Cp860]
-91. Charsetname: IBM-861
- displayName: IBM-861: PC Iceland
- aliases: [Cp861, ibm861]
-92. Charsetname: IBM-862
- displayName: IBM-862: PC Israel
- aliases: [Cp862, ibm862]
-93. Charsetname: IBM-863
- displayName: IBM-863: PC Canadian French
- aliases: [ibm863, Cp863]
-94. Charsetname: IBM-864
- displayName: IBM-864: PC Arabic
- aliases: [ibm864, Cp864]
-95. Charsetname: IBM-864S
- displayName: IBM-864S: PC Arabic (shaped)
- aliases: [ibm864S, Cp864S]
-96. Charsetname: IBM-865
- displayName: IBM-865: PC Nordic
- aliases: [Cp865, ibm865]
-97. Charsetname: IBM-866
- displayName: IBM-866: PC Russia
- aliases: [Cp866, ibm866]
-98. Charsetname: IBM-867
- displayName: IBM-867: PC Israel
- aliases: [Cp867, ibm867]
-99. Charsetname: IBM-868
- displayName: IBM-868: PC Urdu
- aliases: [Cp868, ibm868]
-100. Charsetname: IBM-869
- displayName: IBM-869: PC Greece
- aliases: [Cp869, ibm869]
-101. Charsetname: IBM-870
- displayName: IBM-870: EBCDIC Latin 2
- aliases: [Cp870, ibm870]
-102. Charsetname: IBM-871
- displayName: IBM-871: EBCDIC Iceland
- aliases: [Cp871, ibm871]
-103. Charsetname: IBM-874
- displayName: IBM-874: PC Thai
- aliases: [ibm874, Cp874]
-104. Charsetname: IBM-875
- displayName: IBM-875: EBCDIC Greek
- aliases: [Cp875, ibm875]
-105. Charsetname: IBM-897
- displayName: IBM-897: PC SBCS-only Japan
- aliases: [Cp897, ibm897]
-106. Charsetname: IBM-918
- displayName: IBM-918: EBCDIC Urdu
- aliases: [ibm918, Cp918]
-107. Charsetname: IBM-921
- displayName: IBM-921: PC Baltic
- aliases: [ibm921, Cp921]
-108. Charsetname: IBM-922
- displayName: IBM-922: PC Estonian
- aliases: [Cp922, ibm922]
-109. Charsetname: IBM-924
- displayName: IBM-924: EBCDIC Latin 9
- aliases: [ibm924, Cp924]
-110. Charsetname: IBM-927
- displayName: IBM-927: PC DBCS-only Taiwan
- aliases: [ibm927, Cp927]
-111. Charsetname: IBM-930
- displayName: IBM-930: EBCDIC Japan DBCS
- aliases: [Cp930, ibm930]
-112. Charsetname: IBM-932
- displayName: IBM-932: PC Japan SJIS-78 syntax
- aliases: [Cp932, ibm932]
-113. Charsetname: IBM-933
- displayName: IBM-933: EBCDIC Korea DBCS
- aliases: [Cp933, ibm933]
-114. Charsetname: IBM-935
- displayName: IBM-935: EBCDIC China DBCS
- aliases: [Cp935, ibm935]
-115. Charsetname: IBM-937
- displayName: IBM-937: EBCDIC Taiwan DBCS
- aliases: [Cp937, ibm937]
-116. Charsetname: IBM-939
- displayName: IBM-939: EBCDIC Japan Extended DBCS
- aliases: [Cp939, ibm939]
-117. Charsetname: IBM-942
- displayName: IBM-942: PC Japan SJIS-78
- aliases: [ibm942, Cp942]
-118. Charsetname: IBM-942C
- displayName: IBM-942C: PC Japan SJIS-78 syntax
- aliases: [ibm942C, Cp942C]
-119. Charsetname: IBM-943
- displayName: IBM-943: PC Japan SJIS-90
- aliases: [ibm943, Cp943]
-120. Charsetname: IBM-943C
- displayName: IBM-943C: PC Japan SJIS-90 syntax
- aliases: [Cp943C, ibm943C]
-121. Charsetname: IBM-947
- displayName: IBM-947: PC DBCS-only Taiwan
- aliases: [ibm947, Cp947]
-122. Charsetname: IBM-948
- displayName: IBM-948: PC Taiwan SAA
- aliases: [ibm948, Cp948]
-123. Charsetname: IBM-949
- displayName: IBM-949: PC Korea (KS)
- aliases: [Cp949, ibm949]
-124. Charsetname: IBM-949C
- displayName: IBM-949C: PC Korea (KS)
- aliases: [Cp949C, ibm949C]
-125. Charsetname: IBM-950
- displayName: IBM-950: PC Taiwan
- aliases: [ibm950, Cp950]
-126. Charsetname: IBM-951
- displayName: IBM-951: PC DBCS-only Korean
- aliases: [Cp951, ibm951]
-127. Charsetname: IBM-954
- displayName: IBM-954: EUC Japan (full)
- aliases: [Cp954, ibm954]
-128. Charsetname: IBM-954C
- displayName: IBM-954C: EUC Japan (full) with syntax
- aliases: [Cp954c, ibm-eucjp]
-129. Charsetname: IBM-964
- displayName: IBM-964: EUC Taiwan
- aliases: [Cp964, ibm-euctw]
-130. Charsetname: IBM-971
- displayName: IBM-971: EUC DBCS-only Korean
- aliases: [Cp971, ibm971]
-131. Charsetname: ISCII91
- displayName: ISCII91: ISCII Devenagari 91
- aliases: [iscii]
-132. Charsetname: ISO-2022-CN
- displayName: ISO-2022-CN: ISO 2022 Traditional Chinese
- aliases: [iso2022-cn-cns, iso-2022-cn-cns, iso2022cn-cns, iso2022cn, iso2022-cn]
-133. Charsetname: ISO-2022-CN-GB
- displayName: ISO-2022-CN-GB: ISO 2022 Simplified Chinese
- aliases: [iso2022cn-gb, iso2022-cn-gb]
-134. Charsetname: ISO-2022-JP
- displayName: ISO-2022-JP: ISO 2022 Japan
- aliases: [jis, csiso2022jp2, iso2022-jp, csjisencoding, jis-encoding, iso-2022-jp2, iso2022jp]
-135. Charsetname: ISO-2022-KR
- displayName: ISO-2022-KR: ISO 2022 Korea
- aliases: [iso2022-kr, csiso2022kr, iso2022kr]
-136. Charsetname: ISO-8859-1
- displayName: ISO-8859-1: ISO Latin 1 - Western Europe
- aliases: [csisolatin1, iso-ir-100, iso8859-1, ibm-819, iso8859_1, latin1, 8859-1, ibm819, iso-8859-1:1987, Cp819, l1]
-137. Charsetname: ISO-8859-10
- displayName: ISO-8859-10: ISO Latin 6 - Nordic
- aliases: [iso8859-10, ISO_8859-10:1992, latin6, ibm-919, 8859-10, iso-ir-157, l6, iso8859_10, csisolatin6]
-138. Charsetname: ISO-8859-13
- displayName: ISO-8859-13: ISO Latin 7 - Baltic Rim
- aliases: [iso8859-13, iso8859_13, 8859-13]
-139. Charsetname: ISO-8859-14
- displayName: ISO-8859-14: ISO Latin 8 - Celtic
- aliases: [8859-14, iso8859_14, iso-ir-199, ISO_8859-14:1998, latin8, iso8859-14, isoceltic, l8]
-140. Charsetname: ISO-8859-15
- displayName: ISO-8859-15: ISO Latin 9 - Euro
- aliases: [l9, ibm923, csisolatin9, 8859-9, iso8859-15, ibm-923, latin9, iso8859_15, Cp923, iso8859_15_fdis, latin0]
-141. Charsetname: ISO-8859-16
- displayName: ISO-8859-16: ISO Romanian
- aliases: [iso8859_16, iso8859-16, 8859-16]
-142. Charsetname: ISO-8859-2
- displayName: ISO-8859-2: ISO Latin 2 - Central Europe
- aliases: [ibm912, l2, ibm-912, iso-ir-101, csisolatin2, iso-8859-2:1987, latin2, iso8859_2, Cp912, iso8859-2, 8859-2]
-143. Charsetname: ISO-8859-3
- displayName: ISO-8859-3: ISO Latin 3 - Latin/Esperanto
- aliases: [iso-8859-3:1988, csisolatin3, iso8859_3, 8859-3, iso8859-3, Cp913, iso-ir-109, ibm-913, l3, latin3]
-144. Charsetname: ISO-8859-4
- displayName: ISO-8859-4: ISO Latin 4 - Baltic
- aliases: [iso-ir-110, Cp914, l4, ibm-914, latin4, iso8859_4, iso-8859-4:1988, iso8859-4, 8859-4, csisolatin4]
-145. Charsetname: ISO-8859-5
- displayName: ISO-8859-5: ISO Cyrillic
- aliases: [iso8859_5, 8859-5, ibm915, iso-8859-5:1988, csisolatincyrillic, cyrillic, Cp915, iso-ir-144, iso8859-5, ibm-915]
-146. Charsetname: ISO-8859-6
- displayName: ISO-8859-6: ISO Arabic
- aliases: [iso-ir-127, csisolatinarabic, iso8859-6, ibm1089, ecma-114, asmo-708, arabic, ibm-1089, iso8859_6, 8859-6, Cp1089, iso-8859-6:1987]
-147. Charsetname: ISO-8859-6S
- displayName: ISO-8859-6S: ISO Arabic (shaped)
- aliases: [iso8859-6S, iso8859_6S]
-148. Charsetname: ISO-8859-7
- displayName: ISO-8859-7: ISO Greek
- aliases: [iso-8859-7:1987, Cp813, 8859-7, iso-ir-126, ibm-813, iso8859_7, ecma-118, greek8, ibm813, elot-928, csisolatingreek, iso8859-7, greek]
-149. Charsetname: ISO-8859-8
- displayName: ISO-8859-8: ISO Hebrew
- aliases: [iso-ir-138, iso8859-8, ibm-916, iso8859_8, csisolatinhebrew, hebrew, iso-8859-8:1988, ibm916, Cp916, 8859-8]
-150. Charsetname: ISO-8859-9
- displayName: ISO-8859-9: ISO Latin 5 - Turkey
- aliases: [Cp920, latin5, iso-ir-148, 8859-9, l5, csisolatin5, ibm-920, ibm920, iso8859_9, iso8859-9]
-151. Charsetname: JIS0201
- displayName: JIS0201: Japan JIS 0201 (katakana)
- aliases: []
-152. Charsetname: JIS0208
- displayName: JIS0208: Japan JIS 0208
- aliases: []
-153. Charsetname: JIS0212
- displayName: JIS0212: Japan JIS 0212 (extended)
- aliases: []
-154. Charsetname: Johab
- displayName: Johab: PC Korean Johab
- aliases: []
-155. Charsetname: KOI8-R
- displayName: KOI8-R: Internet Russia
- aliases: [ibm-878, cskoi8r, koi8, koi8_r]
-156. Charsetname: KOI8-RU
- displayName: KOI8-RU: Internet Belarus
- aliases: [ibm-1168, koi8_ru]
-157. Charsetname: KOI8-U
- displayName: KOI8-U: Internet Ukraine
- aliases: [ibm-1167, koi8_u]
-158. Charsetname: KSC5601
- displayName: KSC5601: Korea KSC
- aliases: []
-159. Charsetname: MacArabic
- displayName: MacArabic: Apple Arabic
- aliases: []
-160. Charsetname: MacCentralEurope
- displayName: MacCentralEurope: Apple Central Europe
- aliases: [ibm-1282]
-161. Charsetname: MacCroatian
- displayName: MacCroatian: Apple Croatian
- aliases: [ibm-1284]
-162. Charsetname: MacCyrillic
- displayName: MacCyrillic: Apple Cyrillic
- aliases: [ibm-1283]
-163. Charsetname: MacDingbat
- displayName: MacDingbat: Apple Dingbat
- aliases: []
-164. Charsetname: MacGreek
- displayName: MacGreek: Apple Greek
- aliases: [ibm-1280]
-165. Charsetname: MacHebrew
- displayName: MacHebrew: Apple Hebrew
- aliases: []
-166. Charsetname: MacIceland
- displayName: MacIceland: Apple Iceland
- aliases: [ibm-1286]
-167. Charsetname: MacRoman
- displayName: MacRoman: Apple Roman
- aliases: [ibm-1275]
-168. Charsetname: MacRomania
- displayName: MacRomania: Apple Romania
- aliases: [ibm-1285]
-169. Charsetname: MacSymbol
- displayName: MacSymbol: Apple PostScript Symbol
- aliases: [Adobe-Symbol-Encoding, ibm-1038]
-170. Charsetname: MacThai
- displayName: MacThai: Apple Thai
- aliases: []
-171. Charsetname: MacTurkish
- displayName: MacTurkish: Apple Turkish
- aliases: [ibm-1281]
-172. Charsetname: MacUkraine
- displayName: MacUkraine: Apple Ukraine
- aliases: []
-173. Charsetname: PTCP154
- displayName: PTCP154: Windows Cyrillic Asian
- aliases: [IBM-1169, csPTCP154, Cyrillic-Asian, PT154]
-174. Charsetname: Shift_JIS
- displayName: Shift_JIS: Shift JIS Japan
- aliases: []
-175. Charsetname: TIS-620
- displayName: TIS-620: PC Thailand
- aliases: [tis620.2533, tis620]
-176. Charsetname: US-ASCII
- displayName: US-ASCII: ASCII 7 bit
- aliases: [iso-646.irv:1983, ISO646-US, ASCII, default, ISO-646.irv:1991, direct, ascii7, ANSI_X3.4-1986, iso-ir-6, us, ibm-367, 646, csASCII, ANSI_X3.4-1968, Cp367]
-177. Charsetname: UTF-16
- displayName: UTF-16
- aliases: [Unicode, UTF16, UTF_16, UCS-2]
-178. Charsetname: UTF-16BE
- displayName: UTF-16BE: Unicode UTF-16 Big-endian
- aliases: [X-UTF-16BE, UnicodeBigUnmarked, UTF16BE, UTF_16BE, ISO-10646-UCS-2]
-179. Charsetname: UTF-16LE
- displayName: UTF-16LE: Unicode UTF-16 Little-endian
- aliases: [UTF_16LE, UTF16LE, UnicodeLittleUnmarked, X-UTF-16LE]
-180. Charsetname: UTF-32
- displayName: UTF-32: Unicode UTF-32
- aliases: [ISO-10646-UCS-4, UTF32, UCS-4, UTF_32BE]
-181. Charsetname: UTF-32BE
- displayName: UTF-32BE: Unicode UTF-32 Big-endian
- aliases: [UTF32BE, X-UTF-32BE, UTF_32BE]
-182. Charsetname: UTF-32LE
- displayName: UTF-32LE: Unicode UTF-32 Little-endian
- aliases: [UTF_32LE, UTF32LE, X-UTF-32LE]
-183. Charsetname: UTF-8
- displayName: UTF-8: Unicode UTF-8
- aliases: [UTF_8, UTF8]
-184. Charsetname: UTF-8J
- displayName: UTF-8J: Unicode UTF-8 (Java)
- aliases: [UTF8J]
-185. Charsetname: windows-1250
- displayName: windows-1250: Windows Latin 2
- aliases: [ibm-1250, Cp1250]
-186. Charsetname: windows-1251
- displayName: windows-1251: Windows Cyrillic
- aliases: [ibm-1251, Cp1251]
-187. Charsetname: windows-1252
- displayName: windows-1252: Windows Latin 1
- aliases: [Cp1252, ibm-1252]
-188. Charsetname: windows-1253
- displayName: windows-1253: Windows Greek
- aliases: [Cp1253, ibm-1253]
-189. Charsetname: windows-1254
- displayName: windows-1254: Windows Latin 5 (Turkey)
- aliases: [Cp1254, ibm-1254]
-190. Charsetname: windows-1255
- displayName: windows-1255: Windows Hebrew
- aliases: [Cp1255, ibm-1255]
-191. Charsetname: windows-1256
- displayName: windows-1256: Windows Arabic
- aliases: [Cp1256, ibm-1256]
-192. Charsetname: windows-1256S
- displayName: windows-1256S: Windows Arabic (shaped)
- aliases: [ibm-1256s, Cp1256s]
-193. Charsetname: windows-1257
- displayName: windows-1257: Windows Latin 4 (Balttic)
- aliases: [Cp1257, ibm-1257]
-194. Charsetname: windows-1258
- displayName: windows-1258: Windows Vietnamese
- aliases: [ibm-1129, ibm-1258, Cp1258]
-195. Charsetname: windows-874
- displayName: windows-874: Windows Thai
- aliases: [MS874]
-196. Charsetname: windows-932
- displayName: windows-932: Windows Japan
- aliases: [ms_kanji, cswindows31j, MS932, windows-31j]
-197. Charsetname: windows-936
- displayName: windows-936: Windows China
- aliases: [MS936, 936]
-198. Charsetname: windows-949
- displayName: windows-949: Windows Korea
- aliases: [ibm-1361, Cp1361, ibm1361, MS949, ms1361, ksc5601-1992]
-199. Charsetname: windows-950
- displayName: windows-950: Windows Taiwan
- aliases: [MS950]
-200. Charsetname: X-UnicodeBig
- displayName: X-UnicodeBig: Unicode UTF-16 Big-endian with mark
- aliases: [UnicodeBig]
-201. Charsetname: X-UnicodeLittle
- displayName: X-UnicodeLittle: Unicode UTF-16 Little-endian with mark
- aliases: [UnicodeLittle]
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt b/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt
deleted file mode 100644
index 37922ac..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt
+++ /dev/null
@@ -1,343 +0,0 @@
-
-Current Locale: en_US
-
-JRE version: 1.4.2_03 (1.4.2_03-b02)
--- listing properties --
-java.runtime.name=Java(TM) 2 Runtime Environment, Stand...
-sun.boot.library.path=D:\JDKs\j2sdk1.4.2_03\jre\bin
-java.vm.version=1.4.2_03-b02
-java.vm.vendor=Sun Microsystems Inc.
-java.vendor.url=http://java.sun.com/
-path.separator=;
-java.vm.name=Java HotSpot(TM) Client VM
-file.encoding.pkg=sun.io
-user.country=US
-sun.os.patch.level=Service Pack 1
-java.vm.specification.name=Java Virtual Machine Specification
-user.dir=D:\builds\Daily\eclipse-SDK-I20040304...
-java.runtime.version=1.4.2_03-b02
-java.awt.graphicsenv=sun.awt.Win32GraphicsEnvironment
-java.endorsed.dirs=D:\JDKs\j2sdk1.4.2_03\jre\lib\endorsed
-os.arch=x86
-java.io.tmpdir=C:\DOCUME~1\DAVIDW~1.DMW\LOCALS~1\Temp\
-line.separator=
-
-java.vm.specification.vendor=Sun Microsystems Inc.
-user.variant=
-os.name=Windows XP
-sun.java2d.fontpath=
-java.library.path=D:\JDKs\j2sdk1.4.2_03\bin;.;C:\WINDOW...
-java.specification.name=Java Platform API Specification
-java.class.version=48.0
-java.util.prefs.PreferencesFactory=java.util.prefs.WindowsPreferencesFac...
-os.version=5.1
-user.home=C:\Documents and Settings\davidw.DMW2T23
-user.timezone=
-java.awt.printerjob=sun.awt.windows.WPrinterJob
-file.encoding=Cp1252
-java.specification.version=1.4
-user.name=davidw
-java.class.path=D:\builds\Daily\eclipse-SDK-I20040304...
-java.vm.specification.version=1.0
-sun.arch.data.model=32
-java.home=D:\JDKs\j2sdk1.4.2_03\jre
-java.specification.vendor=Sun Microsystems Inc.
-user.language=en
-awt.toolkit=sun.awt.windows.WToolkit
-java.vm.info=mixed mode
-java.version=1.4.2_03
-java.ext.dirs=D:\JDKs\j2sdk1.4.2_03\jre\lib\ext
-sun.boot.class.path=D:\JDKs\j2sdk1.4.2_03\jre\lib\rt.jar;...
-java.vendor=Sun Microsystems Inc.
-file.separator=\
-java.vendor.url.bug=http://java.sun.com/cgi-bin/bugreport...
-sun.cpu.endian=little
-sun.io.unicode.encoding=UnicodeLittle
-sun.cpu.isalist=pentium i486 i386
-Available Locales
-ar
-ar_AE
-ar_BH
-ar_DZ
-ar_EG
-ar_IQ
-ar_JO
-ar_KW
-ar_LB
-ar_LY
-ar_MA
-ar_OM
-ar_QA
-ar_SA
-ar_SD
-ar_SY
-ar_TN
-ar_YE
-hi_IN
-iw
-iw_IL
-ja
-ja_JP
-ko
-ko_KR
-th
-th_TH
-th_TH_TH
-zh
-zh_CN
-zh_HK
-zh_TW
-be
-be_BY
-bg
-bg_BG
-ca
-ca_ES
-cs
-cs_CZ
-da
-da_DK
-de
-de_AT
-de_CH
-de_DE
-de_LU
-el
-el_GR
-en_AU
-en_CA
-en_GB
-en_IE
-en_IN
-en_NZ
-en_ZA
-es
-es_AR
-es_BO
-es_CL
-es_CO
-es_CR
-es_DO
-es_EC
-es_ES
-es_GT
-es_HN
-es_MX
-es_NI
-es_PA
-es_PE
-es_PR
-es_PY
-es_SV
-es_UY
-es_VE
-et
-et_EE
-fi
-fi_FI
-fr
-fr_BE
-fr_CA
-fr_CH
-fr_FR
-fr_LU
-hr
-hr_HR
-hu
-hu_HU
-is
-is_IS
-it
-it_CH
-it_IT
-lt
-lt_LT
-lv
-lv_LV
-mk
-mk_MK
-nl
-nl_BE
-nl_NL
-no
-no_NO
-no_NO_NY
-pl
-pl_PL
-pt
-pt_BR
-pt_PT
-ro
-ro_RO
-ru
-ru_RU
-sh
-sh_YU
-sk
-sk_SK
-sl
-sl_SI
-sq
-sq_AL
-sr
-sr_YU
-sv
-sv_SE
-tr
-tr_TR
-uk
-uk_UA
-en
-en_US
-file.encoding.pkg: sun.io
-file.encoding: Cp1252
-
-
-Available Charsets
-1. Charsetname: Big5
- displayName: Big5
- aliases: [csBig5]
-2. Charsetname: Big5-HKSCS
- displayName: Big5-HKSCS
- aliases: [big5-hkscs, Big5_HKSCS, big5hkscs]
-3. Charsetname: EUC-JP
- displayName: EUC-JP
- aliases: [eucjis, x-eucjp, csEUCPkdFmtjapanese, eucjp, Extended_UNIX_Code_Packed_Format_for_Japanese, x-euc-jp, euc_jp]
-4. Charsetname: EUC-KR
- displayName: EUC-KR
- aliases: [ksc5601, 5601, ksc5601_1987, ksc_5601, ksc5601-1987, euc_kr, ks_c_5601-1987, euckr, csEUCKR]
-5. Charsetname: GB18030
- displayName: GB18030
- aliases: [gb18030-2000]
-6. Charsetname: GBK
- displayName: GBK
- aliases: [windows-936, CP936]
-7. Charsetname: ISO-2022-JP
- displayName: ISO-2022-JP
- aliases: [jis, jis_encoding, csjisencoding, csISO2022JP, iso2022jp]
-8. Charsetname: ISO-2022-KR
- displayName: ISO-2022-KR
- aliases: [ISO2022KR, csISO2022KR]
-9. Charsetname: ISO-8859-1
- displayName: ISO-8859-1
- aliases: [iso-ir-100, 8859_1, ISO_8859-1, ISO8859_1, 819, csISOLatin1, IBM-819, ISO_8859-1:1987, latin1, cp819, ISO8859-1, IBM819, ISO_8859_1, l1]
-10. Charsetname: ISO-8859-13
- displayName: ISO-8859-13
- aliases: [iso8859_13]
-11. Charsetname: ISO-8859-15
- displayName: ISO-8859-15
- aliases: [8859_15, csISOlatin9, IBM923, cp923, 923, L9, IBM-923, ISO8859-15, LATIN9, ISO_8859-15, LATIN0, csISOlatin0, ISO8859_15_FDIS, ISO-8859-15]
-12. Charsetname: ISO-8859-2
- displayName: ISO-8859-2
- aliases: [l2, iso-ir-101, ISO_8859-2:1987, ISO_8859-2, latin2, csISOLatin2, iso8859_2]
-13. Charsetname: ISO-8859-3
- displayName: ISO-8859-3
- aliases: []
-14. Charsetname: ISO-8859-4
- displayName: ISO-8859-4
- aliases: [iso-ir-110, l4, latin4, csISOLatin4, iso8859_4, ISO_8859-4:1988, ISO_8859-4]
-15. Charsetname: ISO-8859-5
- displayName: ISO-8859-5
- aliases: [cyrillic, iso8859_5, ISO_8859-5, iso-ir-144, csISOLatinCyrillic]
-16. Charsetname: ISO-8859-6
- displayName: ISO-8859-6
- aliases: []
-17. Charsetname: ISO-8859-7
- displayName: ISO-8859-7
- aliases: [greek8, ECMA-118, sun_eu_greek, ELOT_928, ISO_8859-7:1987, iso-ir-126, ISO_8859-7, iso8859_7, greek, csISOLatinGreek]
-18. Charsetname: ISO-8859-8
- displayName: ISO-8859-8
- aliases: []
-19. Charsetname: ISO-8859-9
- displayName: ISO-8859-9
- aliases: [iso-ir-148, latin5, l5, ISO_8859-9, ISO_8859-9:1989, csISOLatin5, iso8859_9]
-20. Charsetname: JIS_X0201
- displayName: JIS_X0201
- aliases: [JIS_X0201, X0201, JIS0201, csHalfWidthKatakana]
-21. Charsetname: JIS_X0212-1990
- displayName: JIS_X0212-1990
- aliases: [jis_x0212-1990, iso-ir-159, x0212, JIS0212, csISO159JISX02121990]
-22. Charsetname: KOI8-R
- displayName: KOI8-R
- aliases: [koi8, cskoi8r]
-23. Charsetname: Shift_JIS
- displayName: Shift_JIS
- aliases: [shift-jis, x-sjis, ms_kanji, shift_jis, csShiftJIS, sjis, pck]
-24. Charsetname: TIS-620
- displayName: TIS-620
- aliases: []
-25. Charsetname: US-ASCII
- displayName: US-ASCII
- aliases: [ISO646-US, IBM367, ASCII, cp367, ascii7, ANSI_X3.4-1986, iso-ir-6, us, 646, iso_646.irv:1983, csASCII, ANSI_X3.4-1968, ISO_646.irv:1991]
-26. Charsetname: UTF-16
- displayName: UTF-16
- aliases: [UTF_16]
-27. Charsetname: UTF-16BE
- displayName: UTF-16BE
- aliases: [X-UTF-16BE, UTF_16BE, ISO-10646-UCS-2]
-28. Charsetname: UTF-16LE
- displayName: UTF-16LE
- aliases: [UTF_16LE, X-UTF-16LE]
-29. Charsetname: UTF-8
- displayName: UTF-8
- aliases: [UTF8]
-30. Charsetname: windows-1250
- displayName: windows-1250
- aliases: [cp1250]
-31. Charsetname: windows-1251
- displayName: windows-1251
- aliases: [cp1251]
-32. Charsetname: windows-1252
- displayName: windows-1252
- aliases: [cp1252]
-33. Charsetname: windows-1253
- displayName: windows-1253
- aliases: [cp1253]
-34. Charsetname: windows-1254
- displayName: windows-1254
- aliases: [cp1254]
-35. Charsetname: windows-1255
- displayName: windows-1255
- aliases: []
-36. Charsetname: windows-1256
- displayName: windows-1256
- aliases: []
-37. Charsetname: windows-1257
- displayName: windows-1257
- aliases: [cp1257]
-38. Charsetname: windows-1258
- displayName: windows-1258
- aliases: []
-39. Charsetname: windows-31j
- displayName: windows-31j
- aliases: [csWindows31J, windows-932, MS932]
-40. Charsetname: x-EUC-CN
- displayName: x-EUC-CN
- aliases: [gb2312, EUC_CN, euccn, euc-cn, gb2312-80, gb2312-1980]
-41. Charsetname: x-euc-jp-linux
- displayName: x-euc-jp-linux
- aliases: [euc_jp_linux, euc-jp-linux]
-42. Charsetname: x-EUC-TW
- displayName: x-EUC-TW
- aliases: [cns11643, euc_tw, EUC-TW, euctw]
-43. Charsetname: x-ISCII91
- displayName: x-ISCII91
- aliases: [iscii, ST_SEV_358-88, iso-ir-153, csISO153GOST1976874, ISCII91]
-44. Charsetname: x-JIS0208
- displayName: x-JIS0208
- aliases: [JIS_C6626-1983, JIS0208, csISO87JISX0208, x0208, JIS_X0208-1983, iso-ir-87]
-45. Charsetname: x-Johab
- displayName: x-Johab
- aliases: [johab, ms1361, ksc5601-1992, ksc5601_1992]
-46. Charsetname: x-MS950-HKSCS
- displayName: x-MS950-HKSCS
- aliases: [MS950_HKSCS]
-47. Charsetname: x-mswin-936
- displayName: x-mswin-936
- aliases: [ms936, ms_936]
-48. Charsetname: x-windows-949
- displayName: x-windows-949
- aliases: [windows949, ms_949, ms949]
-49. Charsetname: x-windows-950
- displayName: x-windows-950
- aliases: [windows-950, ms950]
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties b/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties
deleted file mode 100644
index e5bbbaf..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.tests.encoding
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = Encoding Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java
deleted file mode 100644
index fe5cf3e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.charset.IllegalCharsetNameException;
-import java.nio.charset.MalformedInputException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.internal.encoding.CodedReaderCreator;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-/**
- * This class is intended to be executed only at development time, and it
- * creates the class to JUnit test all the files found in the testfiles
- * directory.
- */
-public class CreateCodedReaderTester extends TestCase {
- // private final String fileDir = "html/";
- // private final String fileRoot =
- // "/builds/Workspaces/HeadWorkspace/org.eclipse.wst.xml.tests.encoding/";
- // private final String fileLocation = fileRoot + fileDir;
- private static final String TESTFILES_ZIPFILE_NAME = "testfiles.zip"; //$NON-NLS-1$
- private static final boolean DEBUG = false;
- private static final String TEST_FILE_DIR = "testfiles"; //$NON-NLS-1$
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.xml.tests.encoding"; //$NON-NLS-1$
- static IProject fTestProject;
- private static int nSetups = 0;
- private static final String currentPlatformCharset = getPlatformDefault();
- private boolean RECREATE_FILES = false;
-
- /**
- *
- */
- public CreateCodedReaderTester() {
- super();
- //System.out.println(currentPlatformCharset);
- }
-
- /**
- * @return
- */
- private static String getPlatformDefault() {
- String platformDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- return platformDefault;
- }
-
- public static void main(String[] args) {
- // try {
- // new CreateCodedReaderTester().doCreateAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.xml.tests.encoding");
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer testFiles = testProject.getFolder("testfiles");
- // assertTrue(testFiles.exists());
- // IResource[] allFolders = testFiles.members();
- // assertNotNull(allFolders);
- }
-
- private void createTestMethodSource(int count, String filePathAndName, String detectedCharsetName, String javaCharsetName, String expectedException) {
- String javaCharsetNameOrKey = javaCharsetName;
- if (null != javaCharsetNameOrKey && javaCharsetNameOrKey.equals(currentPlatformCharset))
- javaCharsetNameOrKey = "expectPlatformCharset";
- System.out.println("public void testFile" + count + " () throws CoreException, IOException {" + " doTest( \"" + javaCharsetNameOrKey + "\", \"" + detectedCharsetName + "\", \"" + filePathAndName + "\", " + expectedException + "); }");
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- public void testCreateAllFiles() throws CoreException, IOException {
- if (RECREATE_FILES) {
- List allFiles = TestsPlugin.getAllTestFiles(TEST_FILE_DIR);
- URL outputDirURL = TestsPlugin.getInstallLocation();
- File zipoutFile = new File(outputDirURL.getPath(), TESTFILES_ZIPFILE_NAME);
- java.io.FileOutputStream zipOut = new FileOutputStream(zipoutFile);
- ZipOutputStream zipOutputStream = new ZipOutputStream(zipOut);
- int count = 1;
- for (Iterator iter = allFiles.iterator(); iter.hasNext();) {
- File file = (File) iter.next();
- createZipEntry(zipOutputStream, file);
- CodedReaderCreator codedReaderCreator = new CodedReaderCreator();
- codedReaderCreator.set(file.getName(), new FileInputStream(file));
- String detectedCharsetName = null;
- String javaCharsetName = null;
- String expectedException = null;
- try {
- // just used for debug info, but can throw exception
- javaCharsetName = codedReaderCreator.getEncodingMemento().getJavaCharsetName();
- detectedCharsetName = codedReaderCreator.getEncodingMemento().getDetectedCharsetName();
- }
- catch (UnsupportedCharsetExceptionWithDetail e) {
- // ignore for simply creating tests
- expectedException = e.getClass().getName() + ".class";
- }
- catch (MalformedInputException e) {
- // ignore for simply creating tests
- expectedException = e.getClass().getName() + ".class";
- }
- catch (IllegalCharsetNameException e) {
- // ignore for simply creating tests
- expectedException = e.getClass().getName() + ".class";
- }
- String subpath = getSubPathName(file);
- createTestMethodSource(count, subpath, detectedCharsetName, javaCharsetName, expectedException);
- count++;
- }
- zipOutputStream.close();
- zipOut.close();
- assertTrue(true);
- }
- }
-
- private String getSubPathName(File file) {
- String path = file.getPath();
- int lastIndex = path.lastIndexOf(TEST_FILE_DIR);
- String subpath = path.substring(lastIndex);
- subpath = subpath.replace('\\', '/');
- return subpath;
- }
-
- /**
- * @param zipOutputStream
- * @param element
- */
- private void createZipEntry(ZipOutputStream zipOutputStream, File file) throws IOException {
- String subPathName = getSubPathName(file);
- ZipEntry zipEntry = new ZipEntry(subPathName);
- zipOutputStream.putNextEntry(zipEntry);
- InputStream inputStream = new FileInputStream(file);
- int nRead = 0;
- byte[] buffer = new byte[1024 * 8];
- while (nRead != -1) {
- nRead = inputStream.read(buffer);
- if (nRead > 0) {
- zipOutputStream.write(buffer, 0, nRead);
- }
- }
- zipOutputStream.flush();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java
deleted file mode 100644
index a599850..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.tests.encoding.properties.TestCommonNames;
-import org.eclipse.wst.xml.tests.encoding.properties.TestOverrides;
-import org.eclipse.wst.xml.tests.encoding.read.TestCodedReader;
-import org.eclipse.wst.xml.tests.encoding.read.TestCodedReaderOnGennedFiles;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentDescription;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDescriptionOnGennedFiles;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetectionForXML;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypes;
-import org.eclipse.wst.xml.tests.encoding.write.TestCodedWrite;
-import org.eclipse.wst.xml.tests.encoding.xml.XMLEncodingTests;
-import org.eclipse.wst.xml.tests.encoding.xml.XMLHeadTokenizerTester;
-
-
-public class EncodingTestSuite extends TestSuite {
-
- // FIXME: commented out lang. spec. tests, until all migrated to org.eclipse
- // [258343] jUnit failures after org.eclipse.core.runtime.xml content type is disabled
- private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class, TestContentTypeDetectionForXML.class};
-// private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
- //private static Class[] classes = new Class[]{TestOverrides.class, CSSEncodingTester.class, CSSHeadTokenizerTester.class, HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, XMLMalformedInputTests.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentTypeDetection.class, TestContentDescription.class, TestContentTypes.class, TestCommonNames.class};
- public EncodingTestSuite() {
- super("XML Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- * @param name
- */
- public EncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param theClass
- */
- public EncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param name
- */
- public EncodingTestSuite(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new EncodingTestSuite();
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java
deleted file mode 100644
index 1ad2948..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-class FileUtil {
- private static String currentWorkspace = "dev0725";
- private static boolean printedOnce = false;
- public static String fLineSeparator = System.getProperty("line.separator");
- public static String fPathSeparator = System.getProperty("path.separator");
- public static String fFileSeparator = System.getProperty("file.separator");
-
- public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
- String installPath = "/builds/Workspaces/" + currentWorkspace + "/org.eclipse.wst.xml.tests.encoding/";
- URL url = new URL("file://" + installPath);
- String totalDirectory = installPath + directory;
- String totalPath = totalDirectory + "/" + filename;
- URL totalURL = new URL(url, totalPath);
- URL finalurl = FileLocator.toFileURL(totalURL);
- String finalFile = finalurl.getFile();
- File file = new File(finalFile);
- String finalPath = file.getParent();
- File dir = new File(finalPath);
- if (!printedOnce) {
- System.out.println("Output written to " + dir.getAbsolutePath());
- printedOnce = true;
- }
-
- if (!dir.exists()) {
- dir.mkdirs();
- }
- return file;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java
deleted file mode 100644
index 327f4e6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.tests.encoding;
-
-
-public class GenerateFiles {
-
- public static final String getMainDirectoryBasedOnVMName() {
- String mainDirectory = "testfiles/genedFiles-" + getJavaVersion();
- return mainDirectory;
- }
-
- private static final String getJavaVersion() {
- String name = null; //System.getProperty("java.fullversion");
- if (name == null) {
- name = System.getProperty("java.version") + " (" + System.getProperty("java.runtime.version") + ")";
- }
- return name;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java
deleted file mode 100644
index 4dd0e75..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.content.IContentDescription;
-
-/**
- * The purpose and logic of this class is to create small "XML files" of
- * various, known encodings, write them to files, and in later tests, be sure
- * appropriate encoding can be detected, and read in and intact characters.
- */
-public class GenerateXMLFiles extends GenerateFiles {
- private String LF = "\n";
- private String CR = "\r";
- private String CRLF = CR + LF;
- // different text strings for comparisons
- private String textUS_ASCII_LF = "abcdefghijklmnopqrstuvwxyz\n1234567890\nABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private String textUS_ASCII_CRLF = "abcdefghijklmnopqrstuvwxyz\r\n1234567890\r\nABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private boolean DEBUG = true;
- private boolean DEBUGCRLF = false;
- private boolean DEBUGINFO = true;
-
-
- public GenerateXMLFiles() {
- super();
- }
-
- public static void main(String[] args) {
- //junit.textui.TestRunner.run(GenerateXMLFiles.class);
- GenerateXMLFiles thisApp = new GenerateXMLFiles();
- try {
- //thisApp.generateOriginalFiles();
- thisApp.generateAllFilesForCurrentVM();
- }
- catch (IOException e) {
-
- e.printStackTrace();
- }
- }
-
- private void generateAllFilesForCurrentVM() throws IOException {
- Map allCharsetMap = Charset.availableCharsets();
- Set allKeys = allCharsetMap.keySet();
- Object[] allcharsets = allKeys.toArray();
- String[] allcharsetNames = new String[allcharsets.length];
- for (int i = 0; i < allcharsets.length; i++) {
- allcharsetNames[i] = allcharsets[i].toString();
-
- }
- //createFiles(allcharsetNames, false);
- createFiles(allcharsetNames, true);
-
- }
-
- private void createFiles(String[] charsetnames, boolean useCRLF) throws FileNotFoundException, IOException {
-
- String charsetName = null;
- Writer out = null;
- String mainDirectory = getMainDirectoryBasedOnVMNameAndFileExtension();
- List charsetFilesWritten = new ArrayList();
- for (int i = 0; i < charsetnames.length; i++) {
- try {
-
-
- charsetName = charsetnames[i];
-
- Charset charset = Charset.forName(charsetName);
- CharsetEncoder charsetEncoder = charset.newEncoder();
- charsetEncoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetEncoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- String header = getHeaderStart() + charsetName + getHeaderEnd();
- String fulltext = null;
- if (useCRLF) {
- fulltext = header + textUS_ASCII_CRLF;
- }
- else {
- fulltext = header + textUS_ASCII_LF;
- }
-
- if (!isEbcidic(charsetName, charsetEncoder)) {
- if (charsetEncoder.canEncode(fulltext)) {
- // if (canEncodeCRLF(charsetName, charsetEncoder)
- // &&
- // canEncodeSimpleString(charsetName,
- // charsetEncoder, "<?") &&
- // charsetEncoder.canEncode(fulltext)) {
- String outputfilename = "test-" + charsetName + ".xml";
- File outFile = FileUtil.makeFileFor(mainDirectory, outputfilename, null);
- //System.out.println(outFile.getAbsolutePath());
- OutputStream outputStream = new FileOutputStream(outFile);
- ByteArrayOutputStream bytesout = new ByteArrayOutputStream();
-
- Writer fileWriter = new OutputStreamWriter(outputStream, charsetEncoder);
- // this byte writer is created just to be able to
- // count precise bytes.
- Writer byteWriter = new OutputStreamWriter(bytesout, charsetEncoder);
-
- supplyBOMs(charsetName, outputStream, bytesout);
-
- out = new BufferedWriter(fileWriter);
-
-
- out.write(fulltext);
- byteWriter.write(fulltext);
- out.close();
- byteWriter.flush();
- // if we made is this far, with no exceptions,
- // etc.,
- // then
- // must have been
- // really written.
- String writtenRecord = charsetName;
- charsetFilesWritten.add(writtenRecord);
- if (DEBUG) {
- printDebugInfo(useCRLF, header, outputfilename, bytesout);
- }
- }
- else {
- if (DEBUGINFO) {
- System.out.println(" *** could not convert sample ascii text for " + charsetName);
- }
- }
- }
- }
-
- catch (IOException e) {
- if (DEBUGINFO) {
- System.out.println(" ***** could not generate for " + charsetName);
- String msg = e.getMessage();
- if (msg == null)
- msg = "";
- System.out.println(" due to " + e.getClass().getName() + " " + msg);
- }
- }
- catch (Exception e) {
- if (DEBUGINFO) {
- System.out.println(" ***** could not generate for " + charsetName);
- String msg = e.getMessage();
- if (msg == null)
- msg = "";
- System.out.println(" due to " + e.getClass().getName() + " " + msg);
- }
- }
- finally {
- if (out != null) {
- out.close();
- }
- }
- }
-
-
- // now create file that summarizes what was written
- // suitable to paste as method in test class
- File outFile = FileUtil.makeFileFor(mainDirectory, "testMethods.text", null);
- FileWriter outproperties = new FileWriter(outFile);
- outproperties.write(charsetFilesWritten.size() + CRLF);
- Iterator items = charsetFilesWritten.iterator();
- int n = 0;
- while (items.hasNext()) {
- String itemCreated = (String) items.next();
- String testMethod = createMethod(n++, itemCreated);
- outproperties.write(testMethod + CRLF);
- }
- outproperties.close();
-
- }
-
- /**
- * I thought this used to be automatic, but doesn't seem to be now?!
- */
- private void supplyBOMs(String charsetName, OutputStream outputStream, ByteArrayOutputStream bytesout) throws IOException {
- byte[] nullBytes = new byte[]{0x00, 0x00};
- if (charsetName.equals("UTF-16")) {
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-16LE")) {
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("X-UnicodeLittle")) {
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-16BE")) {
- outputStream.write(IContentDescription.BOM_UTF_16BE);
- bytesout.write(IContentDescription.BOM_UTF_16BE);
- }
- if (charsetName.equals("X-UnicodeBig")) {
- outputStream.write(IContentDescription.BOM_UTF_16BE);
- bytesout.write(IContentDescription.BOM_UTF_16BE);
- }
- if (charsetName.equals("UTF-32")) {
- outputStream.write(nullBytes);
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(nullBytes);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-32LE")) {
- outputStream.write(nullBytes);
- outputStream.write(IContentDescription.BOM_UTF_16LE);
- bytesout.write(nullBytes);
- bytesout.write(IContentDescription.BOM_UTF_16LE);
- }
- if (charsetName.equals("UTF-32BE")) {
- outputStream.write(nullBytes);
- outputStream.write(IContentDescription.BOM_UTF_16BE);
- bytesout.write(nullBytes);
- bytesout.write(IContentDescription.BOM_UTF_16BE);
- }
- }
-
- /**
- * @param i
- * @param itemCreated
- */
- private String createMethod(int i, String itemCreated) {
- String template = " public void testFile" + i + "() throws CoreException, IOException {\r\n" + " String charsetName = \"" + itemCreated + "\";\r\n" + " doGenTest(charsetName);\r\n" + " }";
- return template;
- }
-
- private void printDebugInfo(boolean useCRLF, String header, String outputfilename, ByteArrayOutputStream bytesout) {
- byte[] bytes = bytesout.toByteArray();
- int nBytes = bytes.length;
- int nChars = 0;
- if (useCRLF) {
- nChars = header.length() + textUS_ASCII_CRLF.length();
- }
- else {
- nChars = header.length() + textUS_ASCII_LF.length();
- }
-
- System.out.println("Wrote " + nChars + " characters and " + nBytes + " bytes to " + outputfilename);
- }
-
- // TODO: never used
- boolean canEncodeSimpleString(String charsetName, CharsetEncoder charsetEncocder, String simpleString) {
- // this method added since some encoders don't report that they can't
- // encode something, but they obviously
- // can't, at least in the normal meaning of the word.
- // This seems to mostly apply to some IBM varieties where, apparently,
- // the input can't be interpreted at all without knowing encoding
- // (that is
- // could not be used for content based encoding).
- boolean result = false;
-
- String newAsciiString = null;
- byte[] translatedBytes = null;
- try {
- translatedBytes = simpleString.getBytes(charsetName);
- newAsciiString = new String(translatedBytes, "ascii");
- }
- catch (UnsupportedEncodingException e) {
- // impossible, since checked already
- throw new Error(e);
- }
- result = simpleString.equals(newAsciiString);
- if (!result) {
- if (charsetEncocder.maxBytesPerChar() != 1) {
- // don't check mulitbyte encoders, just assume true (for now).
- result = true;
- if (charsetEncocder.maxBytesPerChar() == 4) {
- //except, let's just exclude four byte streams, for now.
- result = false;
- if (charsetEncocder.averageBytesPerChar() == 2) {
- // except, for some reason UTF has max bytes of 4
- // (average bytes of 2).
- result = false;
- }
- }
- }
- }
-
- return result;
- }
-
- /**
- * A very heuristic method. Should have table, someday.
- */
- private boolean isEbcidic(String charsetName, CharsetEncoder charsetEncocder) {
- boolean result = false;
- String simpleString = "<?";
- String newAsciiString = null;
- byte[] translatedBytes = null;
- try {
- translatedBytes = simpleString.getBytes(charsetName);
- newAsciiString = new String(translatedBytes, "ascii");
- }
- catch (UnsupportedEncodingException e) {
- // impossible, since checked already
- throw new Error(e);
- }
- // experimenting/debugging showed the known ebcidic onces always
- // "mis" tranlated to characters L and o.
- result = "Lo".equals(newAsciiString);
- if (result) {
- System.out.println(charsetName + " assumed to be Edcidic");
- }
- return result;
- }
-
- /**
- * @param charset
- */
- boolean canEncodeCRLF(String charsetName, CharsetEncoder charsetEncoder) {
- boolean result = true;
- //String charsetCononicalName = charsetEncoder.charset().name();
- if (!charsetEncoder.canEncode(LF)) {
- if (DEBUGCRLF) {
- String stringName = "LF";
- String testString = LF;
- exploreConversion(charsetName, stringName, testString);
- System.out.println("can not encode LF for " + charsetEncoder.charset().name());
- }
- result = false;
- }
- if (!charsetEncoder.canEncode(CR)) {
- if (DEBUGCRLF) {
- String stringName = "CR";
- String testString = CR;
- exploreConversion(charsetName, stringName, testString);
- System.out.println("can not encode CR for " + charsetEncoder.charset().name());
- }
- result = false;
- }
- if (!charsetEncoder.canEncode(CRLF)) {
- if (DEBUGCRLF) {
- String stringName = "CRLF";
- String testString = CRLF;
- exploreConversion(charsetName, stringName, testString);
- System.out.println("can not encode CRLF for " + charsetEncoder.charset().name());
- }
- result = false;
- }
- return result;
-
- }
-
- private void exploreConversion(String charsetName, String stringName, String testString) throws Error {
- try {
- String newLF = new String(testString.getBytes(charsetName));
- System.out.print("old " + stringName + " (dec): ");
- dumpString(System.out, testString);
- System.out.println();
- System.out.print("new " + stringName + " (dec): ");
- dumpString(System.out, newLF);
- System.out.println();
- }
- catch (UnsupportedEncodingException e) {
- //should never happen, already checked
- throw new Error(e);
- }
- }
-
- /**
- * @param out
- * @param lf2
- */
- private void dumpString(PrintStream out, String lf2) {
- for (int i = 0; i < lf2.length(); i++) {
- out.print((int) lf2.charAt(i) + " ");
- }
-
- }
-
- public final static String getMainDirectoryBasedOnVMNameAndFileExtension() {
- String mainDirectory = getMainDirectoryBasedOnVMName() + "/xml";
- return mainDirectory;
- }
-
- private String getHeaderStart() {
- return "<?xml version=\"1.0\" encoding=\"";
- }
-
- private String getHeaderEnd() {
- return "\"?>";
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java
deleted file mode 100644
index eef0edd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Small class to list charset detected for a particular VM. Simple run as Java
- * Applications to get output to standard out.
- */
-public class ListCharsets {
- private final String tab = "\t";
-
- public static void main(String[] args) {
-
- ListCharsets thisApp = new ListCharsets();
-
- System.out.println();
-
- System.out.println("Current Locale: " + Locale.getDefault());
-
- System.out.println();
-
- String name = System.getProperty("java.fullversion");
- if (name == null) {
- name = System.getProperty("java.version") + " (" + System.getProperty("java.runtime.version") + ")";
- }
- System.out.println("JRE version: " + name);
-
- System.getProperties().list(System.out);
-
- thisApp.listOfLocales();
-
- System.out.println("file.encoding.pkg: " + System.getProperty("file.encoding.pkg"));
- System.out.println("file.encoding: " + System.getProperty("file.encoding"));
- System.out.println();
-
- for (int i = 0; i < args.length; i++) {
- System.out.println(args[i]);
- }
- System.out.println();
- thisApp.listOfCharsets();
- }
-
- private void listOfLocales() {
- System.out.println("Available Locales");
- Locale[] locales = Locale.getAvailableLocales();
- for (int i = 0; i < locales.length; i++) {
- System.out.println(locales[i]);
-
- }
-
- }
-
- private void listOfCharsets() {
- System.out.println("Available Charsets");
- int count = 0;
- Map map = Charset.availableCharsets();
- Iterator it = map.keySet().iterator();
- while (it.hasNext()) {
- count++;
- // Get charset name
- String charsetName = (String) it.next();
- System.out.println(count + ". " + " Charsetname: " + charsetName);
- // Get charset
- Charset charset = Charset.forName(charsetName);
- System.out.println(tab + "displayName: " + charset.displayName(Locale.getDefault()));
- Set set = charset.aliases();
- System.out.println(tab + "aliases: " + set);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
deleted file mode 100644
index ef9c617..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xml.core.internal.contenttype.ByteReader;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
- // The shared instance.
- private static TestsPlugin plugin;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- return key;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.wst.xml.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = FileLocator.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- result = getFilesInDir(topDir);
- return result;
- }
-
- /**
- * @param topDir
- * @return
- */
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- public static Reader getByteReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new ByteReader(new BufferedInputStream(new FileInputStream(location)));
- return result;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ZippedTest.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ZippedTest.java
deleted file mode 100644
index 18f5232..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ZippedTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.tests.encoding;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-public class ZippedTest {
-
- private static final String TEST_PROJECT_NAME = "org.eclipse.encoding.resource.newtests";
-
- private boolean isSetUp = false;
- private IProject fProject = null;
-
- public void setUp() throws CoreException {
- if (!isSetUp) {
- createProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
-
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- isSetUp = true;
- }
- }
-
- public void shutDown() throws CoreException {
- if (isSetUp) {
- if (fProject != null && fProject.isAccessible()) {
- fProject.delete(true, new NullProgressMonitor());
- }
- isSetUp = false;
- }
- }
-
- public IFile getFile(String fileName) {
- IFile file = null;
- if (fProject != null) {
- file = (IFile) fProject.findMember(fileName);
- }
- return file;
- }
-
- protected IProject createProject() throws CoreException {
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fProject, null, null);
- fProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- return fProject;
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java
deleted file mode 100644
index 4fc24b3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.pref;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-
-public class TestPreferences extends TestCase {
-
- /**
- * @param preferences
- * @throws BackingStoreException
- */
- private static void printChildren(Preferences preferences) throws BackingStoreException {
- System.out.println("\t" + preferences.absolutePath());
- String [] keys = preferences.keys();
- printKeys(keys);
- String[] children = preferences.childrenNames();
- printChildren(children);
- for (int i = 0; i < children.length; i++) {
- String child = children[i];
- Preferences subPreferences = preferences.node(child);
- String [] subkeys = subPreferences.keys();
- System.out.println();
- System.out.println(child);
- System.out.println();
- printKeys(subkeys);
- }
- }
- static private void printChildren(String[] children) {
- printStringArray(children, "\t");
- }
-
- /**
- * @param keys
- */
- private static void printKeys(String[] keys) {
- printStringArray(keys, "\t\t");
-
- }
-
- static private void printStringArray(String[] array, String tabChars) {
- for (int i = 0; i < array.length; i++) {
- String string = array[i];
- System.out.println(tabChars + string);
- }
- }
-
- private boolean DEBUG = true;
-
- private void displayPreferenceTree() {
- IEclipsePreferences eclipsePreferences = Platform.getPreferencesService().getRootNode();
-
-
- try {
- String[] children = eclipsePreferences.childrenNames();
- System.out.println(eclipsePreferences.absolutePath());
- printChildren(children);
-
- for (int i = 0; i < children.length; i++) {
- String string = children[i];
- Preferences preferences = eclipsePreferences.node(string);
- printChildren(preferences);
-
-
- }
-
- }
- catch (BackingStoreException e) {
- e.printStackTrace();
- }
-
- }
-
- public void testAccess() {
- if (DEBUG) {
- displayPreferenceTree();
- }
- // always ok if no exceptions thrown
- assertTrue(true);
- }
-
- public void testContentBasedPrefHTML() {
- IContentType contentType = Platform.getContentTypeManager().findContentTypeFor("test.html");
- Preferences preferences = ContentBasedPreferenceGateway.getPreferences(contentType);
- assertNotNull(preferences);
- }
-
- public void testContentBasedPrefXML() {
- IContentType contentType = Platform.getContentTypeManager().findContentTypeFor("test.xml");
- Preferences preferences = ContentBasedPreferenceGateway.getPreferences(contentType);
- assertNotNull(preferences);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java
deleted file mode 100644
index 1ff78d4..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-
-public class TestCommonNames extends TestCase {
-
- private static final boolean DEBUG = false;
-
- public void testCommonNames() {
- String[] names = CommonCharsetNames.getCommonCharsetNames();
- assertTrue("common charset names could not be loaded", names != null && names.length > 0);
- if (DEBUG) {
- for (int i = 0; i < names.length; i++) {
- String name = names[i];
- String displayName = CommonCharsetNames.getDisplayString(name);
- System.out.println( name + " " + displayName);
- }
- }
- }
-
- public void doTestDefaultIanaNames(String stringToCheck, String defaultName, String expected) {
- String actual = CommonCharsetNames.getPreferredDefaultIanaName(stringToCheck, defaultName);
- assertEquals("default IANA name test failed for " + stringToCheck, expected, actual);
- }
-
- public void testASCII() {
- doTestDefaultIanaNames("ASCII", "UTF-8", "US-ASCII");
- }
-
- public void testCp1252() {
- doTestDefaultIanaNames("Cp1252", "UTF-8", "ISO-8859-1");
- }
-
- public void testMS950() {
- doTestDefaultIanaNames("MS950", "UTF-8", "BIG5");
- }
-
- public void testCp1256() {
- doTestDefaultIanaNames("Cp1256", "UTF-8", "windows-1256");
- }
-
- public void testMS949() {
- doTestDefaultIanaNames("MS949", "UTF-8", "EUC-KR");
- }
-
- public void testEUC_JP() {
- doTestDefaultIanaNames("EUC-JP", "UTF-8", "EUC-JP");
- }
-
- public void testTotallyFake() {
- doTestDefaultIanaNames("totallyFake", "UTF-8", "UTF-8");
- }
-
- public void testSystemEncoding() {
- String systemEnc = System.getProperty("file.encoding");
- if (systemEnc != null) {
- String actual = CommonCharsetNames.getPreferredDefaultIanaName(systemEnc, "UTF-8");
- assertNotNull("default IANA name test failed for system encoding " + systemEnc, actual);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java
deleted file mode 100644
index 7d8423b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-
-
-public class TestDisplayNames extends TestCase {
- private static final boolean DEBUG = false;
-
- public void testCommonName() {
- String displayName = CommonCharsetNames.getDisplayString("ISO-8859-2");
- assertNotNull("display name for charset could not be retrieved", displayName);
- if (DEBUG) {
- System.out.println(displayName);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java
deleted file mode 100644
index c5400a8..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.properties;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.CodedIO;
-
-public class TestOverrides extends TestCase {
-
- private static final boolean DEBUG = false;
-
- public String doTestOverride(String stringToCheck) {
-
- String charset = CodedIO.getAppropriateJavaCharset(stringToCheck);
- assertNotNull("override test failed for " + stringToCheck, charset);
- return charset;
- }
-
- public void testISO88598I() {
- String result = doTestOverride("ISO-8859-8-I");
- assertEquals("mapping override not correct for ISO-8859-8-I", "ISO-8859-8", result);
- if (DEBUG) {
- System.out.println(result);
- }
- }
-
- public void testXSJIS() {
- String result = doTestOverride("X-SJIS");
- assertEquals("mapping override not correct for X-SJIS", "Shift_JIS", result);
- if (DEBUG) {
- System.out.println(result);
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java
deleted file mode 100644
index f436de3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java
+++ /dev/null
@@ -1,614 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.wst.sse.core.internal.encoding.CodedReaderCreator;
-import org.eclipse.wst.sse.core.internal.encoding.IContentDescriptionExtended;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-
-public class TestCodedReader extends TestCase {
- // private final String fileDir = "html/";
- // private final String fileRoot =
- // "/builds/Workspaces/HeadWorkspace/org.eclipse.wst.xml.tests.encoding/";
- // private final String fileLocation = fileRoot + fileDir;
- private static final boolean DEBUG = false;
- private static final boolean DEBUG_TEST_DETAIL = false;
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static final String TEST_PROJECT_NAME = "org.eclipse.encoding.resource.newtests";
- static IProject fTestProject;
- protected static int nSetups = 0;
-
- private String massageCharset(String foundCharset) {
- String result = foundCharset;
- if ("UTF-16LE".equals(foundCharset)) {
- result = "UTF-16";
- } else if ("X-UnicodeLittle".equals(foundCharset)) {
- result = "UTF-16";
- } else if ("X-UnicodeBig".equals(foundCharset)) {
- result = "UTF-16BE";
- }
-
- return result;
- }
-
- /**
- *
- */
- public TestCodedReader() {
- super();
- // System.out.println(currentPlatformCharset);
- }
-
- public static void main(String[] args) {
- // try {
- // new TestCodedReader().doAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- // TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.xml.tests.encoding");
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- // createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[4000];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- protected void doTest(String expectedJavaCharset, String expectedDetectedCharset, String filePath, Class expectedException) throws CoreException, IOException {
- Reader reader = null;
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull(file);
- expectedJavaCharset = massageCharset(expectedJavaCharset);
- expectedDetectedCharset = massageCharset(expectedDetectedCharset);
-
- // note: eventually, I should change calling methods so if detected
- // charset is expected to be same
- // as the 'used' java charset, then simply pass in null, but for now,
- // we'll "force" that here in this
- // method.
- if (expectedJavaCharset.equals(expectedDetectedCharset)) {
- expectedDetectedCharset = null;
- }
-
- try {
- reader = doCoreTest(expectedJavaCharset, expectedDetectedCharset, file);
- } catch (Exception e) {
- if (expectedException != null) {
- boolean result = expectedException.isInstance(e);
- assertTrue("Unexpected Exception: " + getGoodFullMsg(e), result);
- } else {
- // will alway assert if gets to here
- String msg = getGoodFullMsg(e);
- assertNull("Unexpected Exception: " + msg, e);
- }
- } finally {
- if (reader != null) {
- reader.close();
- }
-
- }
- }
-
- protected Reader doCoreTest(String expectedJavaCharset, String expectedDetectedCharset, IFile file) throws CoreException, IOException {
- Reader reader;
- // create these first, to test exception being thrown correctly
- CodedReaderCreator codedReaderCreator = new CodedReaderCreator();
- codedReaderCreator.set(file);
- reader = codedReaderCreator.getCodedReader();
-
- String javaCharsetName = file.getCharset();
- IContentDescription description = file.getContentDescription();
- javaCharsetName = massageCharset(javaCharsetName);
- // codedReaderCreator.getEncodingMemento().getJavaCharsetName();
- if (expectedJavaCharset.equals("expectPlatformCharset")) {
- String platformDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- assertTrue(javaCharsetName.equals(platformDefault));
- } else {
- boolean asExpected = javaCharsetName.equals(expectedJavaCharset);
- assertTrue(javaCharsetName + " did not equal the expected " + expectedJavaCharset + " (this is a VM dependent test)", asExpected);
- }
- String javaCharsetNameProperty = (String) description.getProperty(IContentDescription.CHARSET);
- String detectedCharsetNameProperty = getDetectedCharsetName(description);
- detectedCharsetNameProperty = massageCharset(detectedCharsetNameProperty);
- // if (detectedCharsetName == null) {
- // detectedCharsetName = javaCharsetNameProperty;
- // }
- if (!expectedJavaCharset.equals("expectPlatformCharset")) {
- boolean expecedResult = expectedJavaCharset.equals(javaCharsetNameProperty);
- assertTrue("java based charset name was not as expected", expecedResult);
- } else {
- String expectedDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- boolean ExpectedResult = expectedDefault.equals(javaCharsetNameProperty);
- assertTrue("java based charset name not as expected when platform default expected", ExpectedResult);
- }
-
- if (expectedDetectedCharset != null) {
- boolean expectedResult = expectedDetectedCharset.equals(detectedCharsetNameProperty);
- assertTrue("detected charset name was not as expected", expectedResult);
- }
- // test if can read/write file
- StringBuffer buffer = readInputStream(reader);
- if (DEBUG_TEST_DETAIL) {
- System.out.print(buffer);
- }
- return reader;
- }
-
- /**
- * This method is just to help handle transition from using
- * EncodingMemtento to not using encodingMemento.
- */
- private String getDetectedCharsetName(IContentDescription description) {
- String result = null;
- result = (String) description.getProperty(IContentDescriptionExtended.DETECTED_CHARSET);
- return result;
- }
-
- /**
- * @param e
- * @return
- */
- private String getGoodFullMsg(Exception e) {
- String msg = e.getClass().getName() + ": " + e.getMessage();
- return msg;
- }
-
- public void testFile1() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/css/emptyFile.css", null);
- }
-
- public void testFile2() throws CoreException, IOException {
- doTest("EUC-JP", "EUC-JP", "testfiles/css/encoding_test_eucjp.css", null);
- }
-
- public void testFile3() throws CoreException, IOException {
- doTest("ISO-2022-JP", "ISO-2022-JP", "testfiles/css/encoding_test_jis.css", null);
- }
-
- public void testFile4() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/css/encoding_test_sjis.css", null);
- }
-
- public void testFile5() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/css/noEncoding.css", null);
- }
-
- public void testFile6() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/css/nonStandard.css", null);
- }
-
- public void testFile7() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
-
- public void testFile57() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/html/EmptyFile.html", null);
- }
-
- public void testFile58() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/html/IllformedNormalNonDefault.html", null);
- }
-
- public void testFile59() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/html/LargeNoEncoding.html", null);
- }
-
- public void testFile60() throws CoreException, IOException {
- doTest("ISO-8859-1", "iso-8859-1", "testfiles/html/LargeNonDefault.html", null);
- }
-
- public void testFile61() throws CoreException, IOException {
- doTest("ISO-8859-6", "ISO-8859-6", "testfiles/html/MultiNonDefault.html", null);
- }
-
- public void testFile62() throws CoreException, IOException {
- doTest("expectPlatformCharset", null, "testfiles/html/NoEncoding.html", null);
- }
-
- public void testFile63() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/html/noquotes.html", null);
- }
-
- public void testFile64() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/html/NormalNonDefault.html", null);
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/EmptyFile.jsp", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("ISO-8859-8", null, "testfiles/jsp/IllformedNormalNonDefault.jsp", null);
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("null", "null", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("windows-1252", "Cp1252", "testfiles/jsp/javaEncodingValue.jsp", null);
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/MalformedNoEncoding.jsp", null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/noEncoding.jsp", null);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("ISO-8859-2", "ISO-8859-2", "testfiles/jsp/nomalDirectiveCase.jsp", null);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("ISO-8859-3", "ISO-8859-3", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("ISO-8859-2", "ISO-8859-2", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("ISO-8859-8", null, "testfiles/jsp/NormalNonDefault.jsp", null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("ISO-8859-8", "ISO-8859-8", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTest("ISO-8859-7", "ISO-8859-7", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("ISO-8859-3", "ISO-8859-3", "testfiles/jsp/testBrokenLine.jsp", null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("null", "null", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("null", "null", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testExtraJunk.jsp", null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/testExtraValidStuff.jsp", null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("ISO-8859-1", null, "testfiles/jsp/testIllFormed.jsp", null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/testIllFormed2.jsp", null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testNoEncodingValue.jsp", null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testNoPageDirective.jsp", null);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTest("ISO-8859-2", "ISO-8859-2", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/testNormalCase.jsp", null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("UTF-16", "UTF-16", "testfiles/jsp/testUTF16.jsp", null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("UTF-16LE", "UTF-16LE", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("UTF-16", "UTF-16", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("UTF-16", "UTF-16", "testfiles/jsp/utf16WithJapaneseChars.jsp", null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/jsp/UTF8With3ByteBOM.jsp", null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("ISO-8859-8", "ISO-8859-8", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("Shift_JIS", "Shift_JIS", "testfiles/regressionTestFiles/defect229667/audi.jsp", null);
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("EUC-JP", "EUC-JP", "testfiles/xml/eucjp.xml", null);
- }
-
- // public void testFile105() throws CoreException, IOException {
- // doTest("ISO-8859-1", "ISO-8859-1",
- // "testfiles/xml/IllformedNormalNonDefault.xml", null);
- // }
-
- // public void testFile106() throws CoreException, IOException {
- // doTest("UTF-8", "UTF-8", "testfiles/xml/MalformedNoEncoding.xml",
- // CharacterCodingException.class);
- // }
-
- // public void testFile107() throws CoreException, IOException {
- // doTest("UTF-8", "UTF-8", "testfiles/xml/MalformedNoEncoding.xsl",
- // CharacterCodingException.class);
- // }
-
- public void testFile108() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/NoEncoding.xml", null);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/NormalNonDefault.xml", null);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTest("Shift_JIS", "Shift_JIS", "testfiles/xml/shiftjis.xml", null);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testExtraValidStuff.xml", null);
- }
-
- // public void testFile113() throws CoreException, IOException {
- // doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed.xml", null);
- // }
-
- public void testFile114() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed2.xml", null);
- }
-
- // public void testFile115() throws CoreException, IOException {
- // doTest("null", "null", "testfiles/xml/testIllFormed3.xml",
- // UnsupportedCharsetExceptionWithDetail.class);
- // }
-
- public void testFile116() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testIllFormed4.xml", null);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTest("ISO-8859-1", "ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoEncodingValue.xml", null);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNormalCase.xml", null);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
- // public void testFile123() throws CoreException, IOException {
- // doTest("UTF-16BE", "UTF-16BE", "testfiles/xml/testUTF16.xml",
- // CharacterCodingException.class);
- // }
-
- // public void testFile124() throws CoreException, IOException {
- // doTest("UTF-16LE", "UTF-16LE",
- // "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- // }
-
- // public void testFile125() throws CoreException, IOException {
- // doTest("UTF-16LE", "UTF-16LE",
- // "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- // }
-
- // public void testFile126() throws CoreException, IOException {
- // doTest("UTF-16BE", "UTF-16BE",
- // "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml",
- // CharacterCodingException.class);
- // }
-
- // public void testFile127() throws CoreException, IOException {
- // doTest("UTF-16BE", "UTF-16BE",
- // "testfiles/xml/utf16WithJapaneseChars.xml", null);
- // }
-
- public void testFile128() throws CoreException, IOException {
- doTest("UTF-8", "UTF-8", "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
- public void testDocumentStreamCaseHTML() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/DocumentStreamTestCase/kaeru5.htm", null);
- }
-
- public void testDocumentStreamCaseJSP() throws CoreException, IOException {
- doTest("Shift_JIS", "SHIFT_JIS", "testfiles/DocumentStreamTestCase/kaeru5.jsp", null);
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java
deleted file mode 100644
index 7978943..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding.read;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.GenerateFiles;
-
-
-/**
- * This class should contain a "master list" of all filenames generated by
- * various VM's ... then the test ingores it if the filename's not found due
- * to the VM not supporting it.
- *
- */
-public class TestCodedReaderOnGennedFiles extends TestCodedReader {
- private static int notRan = 0;
- private static final boolean DEBUG = false;
-
- protected void doGenTest(String charsetName) throws CoreException, IOException {
- doTest(charsetName, charsetName, GenerateFiles.getMainDirectoryBasedOnVMName() + "/xml/test-" + charsetName + ".xml", null);
- }
-
- protected void doTest(String expectedJavaCharset, String expectedDetectedCharset, String filePath, Class expectedException) throws CoreException, IOException {
- if (expectedJavaCharset != null && expectedJavaCharset.indexOf("UTF-32") > -1) {
- return; //won't try 32 bit right now
- }
- IFile file = (IFile) fTestProject.findMember(filePath);
-
- // if there no file, just assume that its due to which VM is
- // bring used. (Could be improved in future to avoid counting as a
- // test) - this check in here for initial debugging only
- if (file == null) {
- notRan++;
- if (DEBUG) {
- System.out.println();
- System.out.println("test not ran since charset not supported by VM: " + filePath);
- }
- return;
- }
- super.doTest(expectedJavaCharset, expectedDetectedCharset, filePath, expectedException);
- }
-
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
-
- public void testFile1() throws CoreException, IOException {
- String charsetName = "CESU-8";
- doGenTest(charsetName);
- }
-
- public void testFile2() throws CoreException, IOException {
- String charsetName = "COMPOUND_TEXT";
- doGenTest(charsetName);
- }
-
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-CN";
- doGenTest(charsetName);
- }
-
- public void testFile4() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
-
- public void testFile5() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
-
- public void testFile6() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
-
- public void testFile7() throws CoreException, IOException {
- String charsetName = "GB2312";
- doGenTest(charsetName);
- }
-
- public void testFile8() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
-
- public void testFile9() throws CoreException, IOException {
- String charsetName = "hp-roman8";
- doGenTest(charsetName);
- }
-
- public void testFile10() throws CoreException, IOException {
- String charsetName = "IBM-1006";
- doGenTest(charsetName);
- }
-
- public void testFile11() throws CoreException, IOException {
- String charsetName = "IBM-1041";
- doGenTest(charsetName);
- }
-
- public void testFile12() throws CoreException, IOException {
- String charsetName = "IBM-1043";
- doGenTest(charsetName);
- }
-
- public void testFile13() throws CoreException, IOException {
- String charsetName = "IBM-1046";
- doGenTest(charsetName);
- }
-
- public void testFile14() throws CoreException, IOException {
- String charsetName = "IBM-1046S";
- doGenTest(charsetName);
- }
-
- public void testFile15() throws CoreException, IOException {
- String charsetName = "IBM-1088";
- doGenTest(charsetName);
- }
-
- public void testFile16() throws CoreException, IOException {
- String charsetName = "IBM-1098";
- doGenTest(charsetName);
- }
-
- public void testFile17() throws CoreException, IOException {
- String charsetName = "IBM-1114";
- doGenTest(charsetName);
- }
-
- public void testFile18() throws CoreException, IOException {
- String charsetName = "IBM-1115";
- doGenTest(charsetName);
- }
-
- public void testFile19() throws CoreException, IOException {
- String charsetName = "IBM-1124";
- doGenTest(charsetName);
- }
-
- public void testFile20() throws CoreException, IOException {
- String charsetName = "IBM-1363";
- doGenTest(charsetName);
- }
-
- public void testFile21() throws CoreException, IOException {
- String charsetName = "IBM-1363C";
- doGenTest(charsetName);
- }
-
- public void testFile22() throws CoreException, IOException {
- String charsetName = "IBM-1370";
- doGenTest(charsetName);
- }
-
- public void testFile23() throws CoreException, IOException {
- String charsetName = "IBM-1381";
- doGenTest(charsetName);
- }
-
- public void testFile24() throws CoreException, IOException {
- String charsetName = "IBM-1383";
- doGenTest(charsetName);
- }
-
- public void testFile25() throws CoreException, IOException {
- String charsetName = "IBM-1386";
- doGenTest(charsetName);
- }
-
- public void testFile26() throws CoreException, IOException {
- String charsetName = "IBM-33722C";
- doGenTest(charsetName);
- }
-
- public void testFile27() throws CoreException, IOException {
- String charsetName = "IBM-437";
- doGenTest(charsetName);
- }
-
- public void testFile28() throws CoreException, IOException {
- String charsetName = "IBM-737";
- doGenTest(charsetName);
- }
-
- public void testFile29() throws CoreException, IOException {
- String charsetName = "IBM-775";
- doGenTest(charsetName);
- }
-
- public void testFile30() throws CoreException, IOException {
- String charsetName = "IBM-808";
- doGenTest(charsetName);
- }
-
- public void testFile31() throws CoreException, IOException {
- String charsetName = "IBM-850";
- doGenTest(charsetName);
- }
-
- public void testFile32() throws CoreException, IOException {
- String charsetName = "IBM-852";
- doGenTest(charsetName);
- }
-
- public void testFile33() throws CoreException, IOException {
- String charsetName = "IBM-855";
- doGenTest(charsetName);
- }
-
- public void testFile34() throws CoreException, IOException {
- String charsetName = "IBM-856";
- doGenTest(charsetName);
- }
-
- public void testFile35() throws CoreException, IOException {
- String charsetName = "IBM-857";
- doGenTest(charsetName);
- }
-
- public void testFile36() throws CoreException, IOException {
- String charsetName = "IBM-858";
- doGenTest(charsetName);
- }
-
- public void testFile37() throws CoreException, IOException {
- String charsetName = "IBM-859";
- doGenTest(charsetName);
- }
-
- public void testFile38() throws CoreException, IOException {
- String charsetName = "IBM-860";
- doGenTest(charsetName);
- }
-
- public void testFile39() throws CoreException, IOException {
- String charsetName = "IBM-861";
- doGenTest(charsetName);
- }
-
- public void testFile40() throws CoreException, IOException {
- String charsetName = "IBM-862";
- doGenTest(charsetName);
- }
-
- public void testFile41() throws CoreException, IOException {
- String charsetName = "IBM-863";
- doGenTest(charsetName);
- }
-
- public void testFile42() throws CoreException, IOException {
- String charsetName = "IBM-864";
- doGenTest(charsetName);
- }
-
- public void testFile43() throws CoreException, IOException {
- String charsetName = "IBM-864S";
- doGenTest(charsetName);
- }
-
- public void testFile44() throws CoreException, IOException {
- String charsetName = "IBM-865";
- doGenTest(charsetName);
- }
-
- public void testFile45() throws CoreException, IOException {
- String charsetName = "IBM-866";
- doGenTest(charsetName);
- }
-
- public void testFile46() throws CoreException, IOException {
- String charsetName = "IBM-867";
- doGenTest(charsetName);
- }
-
- public void testFile47() throws CoreException, IOException {
- String charsetName = "IBM-868";
- doGenTest(charsetName);
- }
-
- public void testFile48() throws CoreException, IOException {
- String charsetName = "IBM-869";
- doGenTest(charsetName);
- }
-
- public void testFile49() throws CoreException, IOException {
- String charsetName = "IBM-874";
- doGenTest(charsetName);
- }
-
- public void testFile50() throws CoreException, IOException {
- String charsetName = "IBM-897";
- doGenTest(charsetName);
- }
-
- public void testFile51() throws CoreException, IOException {
- String charsetName = "IBM-921";
- doGenTest(charsetName);
- }
-
- public void testFile52() throws CoreException, IOException {
- String charsetName = "IBM-922";
- doGenTest(charsetName);
- }
-
- public void testFile53() throws CoreException, IOException {
- String charsetName = "IBM-932";
- doGenTest(charsetName);
- }
-
- public void testFile54() throws CoreException, IOException {
- String charsetName = "IBM-942";
- doGenTest(charsetName);
- }
-
- public void testFile55() throws CoreException, IOException {
- String charsetName = "IBM-942C";
- doGenTest(charsetName);
- }
-
- public void testFile56() throws CoreException, IOException {
- String charsetName = "IBM-943";
- doGenTest(charsetName);
- }
-
- public void testFile57() throws CoreException, IOException {
- String charsetName = "IBM-943C";
- doGenTest(charsetName);
- }
-
- public void testFile58() throws CoreException, IOException {
- String charsetName = "IBM-948";
- doGenTest(charsetName);
- }
-
- public void testFile59() throws CoreException, IOException {
- String charsetName = "IBM-949";
- doGenTest(charsetName);
- }
-
- public void testFile60() throws CoreException, IOException {
- String charsetName = "IBM-949C";
- doGenTest(charsetName);
- }
-
- public void testFile61() throws CoreException, IOException {
- String charsetName = "IBM-950";
- doGenTest(charsetName);
- }
-
- public void testFile62() throws CoreException, IOException {
- String charsetName = "IBM-954C";
- doGenTest(charsetName);
- }
-
- public void testFile63() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN";
- doGenTest(charsetName);
- }
-
- public void testFile64() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN-GB";
- doGenTest(charsetName);
- }
-
- public void testFile65() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
-
- public void testFile66() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
-
- public void testFile67() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
-
- public void testFile68() throws CoreException, IOException {
- String charsetName = "ISO-8859-10";
- doGenTest(charsetName);
- }
-
- public void testFile69() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
-
- public void testFile70() throws CoreException, IOException {
- String charsetName = "ISO-8859-14";
- doGenTest(charsetName);
- }
-
- public void testFile71() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
-
- public void testFile72() throws CoreException, IOException {
- String charsetName = "ISO-8859-16";
- doGenTest(charsetName);
- }
-
- public void testFile73() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
-
- public void testFile74() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
-
- public void testFile75() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
-
- public void testFile76() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
-
- public void testFile77() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
-
- public void testFile78() throws CoreException, IOException {
- String charsetName = "ISO-8859-6S";
- doGenTest(charsetName);
- }
-
- public void testFile79() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
-
- public void testFile80() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
-
- public void testFile81() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
-
- public void testFile82() throws CoreException, IOException {
- String charsetName = "JIS0201";
- doGenTest(charsetName);
- }
-
- public void testFile83() throws CoreException, IOException {
- String charsetName = "JIS0208";
- doGenTest(charsetName);
- }
-
- public void testFile84() throws CoreException, IOException {
- String charsetName = "JIS0212";
- doGenTest(charsetName);
- }
-
- public void testFile85() throws CoreException, IOException {
- String charsetName = "Johab";
- doGenTest(charsetName);
- }
-
- public void testFile86() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
-
- public void testFile87() throws CoreException, IOException {
- String charsetName = "KOI8-RU";
- doGenTest(charsetName);
- }
-
- public void testFile88() throws CoreException, IOException {
- String charsetName = "KOI8-U";
- doGenTest(charsetName);
- }
-
- public void testFile89() throws CoreException, IOException {
- String charsetName = "KSC5601";
- doGenTest(charsetName);
- }
-
- public void testFile90() throws CoreException, IOException {
- String charsetName = "MacArabic";
- doGenTest(charsetName);
- }
-
- public void testFile91() throws CoreException, IOException {
- String charsetName = "MacCentralEurope";
- doGenTest(charsetName);
- }
-
- public void testFile92() throws CoreException, IOException {
- String charsetName = "MacCroatian";
- doGenTest(charsetName);
- }
-
- public void testFile93() throws CoreException, IOException {
- String charsetName = "MacCyrillic";
- doGenTest(charsetName);
- }
-
- public void testFile94() throws CoreException, IOException {
- String charsetName = "MacGreek";
- doGenTest(charsetName);
- }
-
- public void testFile95() throws CoreException, IOException {
- String charsetName = "MacHebrew";
- doGenTest(charsetName);
- }
-
- public void testFile96() throws CoreException, IOException {
- String charsetName = "MacIceland";
- doGenTest(charsetName);
- }
-
- public void testFile97() throws CoreException, IOException {
- String charsetName = "MacRoman";
- doGenTest(charsetName);
- }
-
- public void testFile98() throws CoreException, IOException {
- String charsetName = "MacRomania";
- doGenTest(charsetName);
- }
-
- public void testFile99() throws CoreException, IOException {
- String charsetName = "MacThai";
- doGenTest(charsetName);
- }
-
- public void testFile100() throws CoreException, IOException {
- String charsetName = "MacTurkish";
- doGenTest(charsetName);
- }
-
- public void testFile101() throws CoreException, IOException {
- String charsetName = "MacUkraine";
- doGenTest(charsetName);
- }
-
- public void testFile102() throws CoreException, IOException {
- String charsetName = "PTCP154";
- doGenTest(charsetName);
- }
-
- public void testFile103() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
-
- public void testFile104() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
-
- public void testFile105() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
-
-// public void testFile106() throws CoreException, IOException {
-// String charsetName = "UTF-16";
-// doGenTest(charsetName);
-// }
-
-// public void testFile107() throws CoreException, IOException {
-// String charsetName = "UTF-16BE";
-// doGenTest(charsetName);
-// }
-
-// public void testFile108() throws CoreException, IOException {
-// String charsetName = "UTF-16LE";
-// doGenTest(charsetName);
-// }
-
- public void testFile109() throws CoreException, IOException {
- String charsetName = "UTF-32";
- doGenTest(charsetName);
- }
-
- public void testFile110() throws CoreException, IOException {
- String charsetName = "UTF-32BE";
- doGenTest(charsetName);
- }
-
- public void testFile111() throws CoreException, IOException {
- String charsetName = "UTF-32LE";
- doGenTest(charsetName);
- }
-
- public void testFile112() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
-
- public void testFile113() throws CoreException, IOException {
- String charsetName = "UTF-8J";
- doGenTest(charsetName);
- }
-
- public void testFile114() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
-
- public void testFile115() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
-
- public void testFile116() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
-
- public void testFile117() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
-
- public void testFile118() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
-
- public void testFile119() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
-
- public void testFile120() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
-
- public void testFile121() throws CoreException, IOException {
- String charsetName = "windows-1256S";
- doGenTest(charsetName);
- }
-
- public void testFile122() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
-
- public void testFile123() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
-
- public void testFile124() throws CoreException, IOException {
- String charsetName = "windows-874";
- doGenTest(charsetName);
- }
-
- public void testFile125() throws CoreException, IOException {
- String charsetName = "windows-932";
- doGenTest(charsetName);
- }
-
- public void testFile126() throws CoreException, IOException {
- String charsetName = "windows-936";
- doGenTest(charsetName);
- }
-
- public void testFile127() throws CoreException, IOException {
- String charsetName = "windows-949";
- doGenTest(charsetName);
- }
-
-
- public void testFile128() throws CoreException, IOException {
- String charsetName = "windows-950";
- doGenTest(charsetName);
- }
-
-/*
-removed for PPC machine with IBM VM
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
-*/
-// public void testFile129() throws CoreException, IOException {
-// String charsetName = "X-UnicodeBig";
-// doGenTest(charsetName);
-// }
-
-/*
-removed for PPC machine with IBM VM
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
-*/
-// public void testFile130() throws CoreException, IOException {
-// String charsetName = "X-UnicodeLittle";
-// doGenTest(charsetName);
-// }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java
deleted file mode 100644
index 85e6a6e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.wst.sse.core.internal.encoding.NonContentBasedEncodingRules;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-
-public class TestContentDescription extends TestCase {
- // private final String fileDir = "html/";
- // private final String fileRoot =
- // "/builds/Workspaces/HeadWorkspace/org.eclipse.wst.xml.tests.encoding/";
- // private final String fileLocation = fileRoot + fileDir;
- private static final boolean DEBUG = true;
- //private static final boolean DEBUG_TEST_DETAIL = false;
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static final String TEST_PROJECT_NAME = "org.eclipse.encoding.resource.newtests";
- static IProject fTestProject;
- private static int nSetups = 0;
-
- /**
- *
- */
- public TestContentDescription() {
- super();
- //System.out.println(currentPlatformCharset);
- }
-
- public static void main(String[] args) {
- // try {
- // new TestCodedReader().doAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.xml.tests.encoding");
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- protected void doTest(String expectedJavaCharset, String filePath, Class expectedException) throws CoreException, IOException {
- if (expectedJavaCharset != null && expectedJavaCharset.indexOf("UTF-32") > -1) {
- return; //won't try 32 bit right now
- }
- expectedJavaCharset = massageCharset(expectedJavaCharset);
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
- IContentDescription fileContentDescription = file.getContentDescription();
- // IContentDescription streamContentDescription = Platform.getContentTypeManager().getDescriptionFor(file.getContents(), file.getName(), IContentDescription.ALL);
- // assertEquals("comparing file and stream contentDescription", fileContentDescription, streamContentDescription);
-
- assertNotNull("Null content description", fileContentDescription);
- String foundCharset = fileContentDescription.getCharset();
- foundCharset = massageCharset(foundCharset);
-
- if (expectedJavaCharset == null || expectedJavaCharset.equals("expectPlatformCharset")) {
- String platformDefault = NonContentBasedEncodingRules.useDefaultNameRules(null);
- assertTrue(foundCharset.equals(platformDefault));
- }
- else {
- boolean asExpected = foundCharset.equals(expectedJavaCharset);
- assertTrue(foundCharset + " did not equal the expected " + expectedJavaCharset + " (this is a VM dependent test)", asExpected);
- }
-
-
- }
-
- /**
- * @param foundCharset
- * @return
- */
- private String massageCharset(String foundCharset) {
- String result = foundCharset;
- if ("UTF-16LE".equals(foundCharset)) {
- result = "UTF-16";
- }
- else if ("X-UnicodeLittle".equals(foundCharset)) {
- result = "UTF-16";
- }
- else if ("X-UnicodeBig".equals(foundCharset)) {
- result = "UTF-16BE";
- }
-
- return result;
- }
-
- public void testFile1() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/css/emptyFile.css", null);
- }
-
- public void testFile2() throws CoreException, IOException {
- doTest("EUC-JP", "testfiles/css/encoding_test_eucjp.css", null);
- }
-
- public void testFile3() throws CoreException, IOException {
- doTest("ISO-2022-JP", "testfiles/css/encoding_test_jis.css", null);
- }
-
- public void testFile4() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/css/encoding_test_sjis.css", null);
- }
-
- public void testFile5() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/css/noEncoding.css", null);
- }
-
- public void testFile6() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/css/nonStandard.css", null);
- }
-
- public void testFile7() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
-
- public void testFile57() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/html/EmptyFile.html", null);
- }
-
- public void testFile58() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/html/IllformedNormalNonDefault.html", null);
- }
-
- public void testFile59() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/html/LargeNoEncoding.html", null);
- }
-
- public void testFile60() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/html/LargeNonDefault.html", null);
- }
-
- public void testFile61() throws CoreException, IOException {
- doTest("ISO-8859-6", "testfiles/html/MultiNonDefault.html", null);
- }
-
- public void testFile62() throws CoreException, IOException {
- doTest("expectPlatformCharset", "testfiles/html/NoEncoding.html", null);
- }
-
- public void testFile63() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/html/noquotes.html", null);
- }
-
- public void testFile64() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/html/NormalNonDefault.html", null);
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/EmptyFile.jsp", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/IllformedNormalNonDefault.jsp", null);
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("abc", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("windows-1252", "testfiles/jsp/javaEncodingValue.jsp", null);
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/MalformedNoEncoding.jsp", null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/noEncoding.jsp", null);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("ISO-8859-2", "testfiles/jsp/nomalDirectiveCase.jsp", null);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("ISO-8859-3", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("ISO-8859-2", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/NormalNonDefault.jsp", null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTest("ISO-8859-7", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("ISO-8859-3", "testfiles/jsp/testBrokenLine.jsp", null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("testjunk", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("testjunk", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testExtraJunk.jsp", null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/testExtraValidStuff.jsp", null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testIllFormed.jsp", null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/testIllFormed2.jsp", null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testNoEncodingValue.jsp", null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testNoPageDirective.jsp", null);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTest("ISO-8859-2", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/testNormalCase.jsp", null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("UTF-16", "testfiles/jsp/testUTF16.jsp", null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("UTF-16", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("UTF-16", "testfiles/jsp/utf16WithJapaneseChars.jsp", null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/jsp/UTF8With3ByteBOM.jsp", null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("ISO-8859-8", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/regressionTestFiles/defect229667/audi.jsp", null);
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest("EUC-JP", "testfiles/xml/eucjp.xml", null);
- }
-
-// public void testFile105() throws CoreException, IOException {
-// doTest("ISO-8859-1", "testfiles/xml/IllformedNormalNonDefault.xml", null);
-// }
-//
-// public void testFile106() throws CoreException, IOException {
-// doTest("UTF-8", "testfiles/xml/MalformedNoEncoding.xml", null);
-// }
-//
-// public void testFile107() throws CoreException, IOException {
-// doTest("UTF-8", "testfiles/xml/MalformedNoEncoding.xsl", null);
-// }
-
- public void testFile108() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/NoEncoding.xml", null);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/xml/NormalNonDefault.xml", null);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTest("Shift_JIS", "testfiles/xml/shiftjis.xml", null);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/xml/testExtraJunk.xml", null);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testExtraValidStuff.xml", null);
- }
-
-// public void testFile113() throws CoreException, IOException {
-// doTest("UTF-8", "testfiles/xml/testIllFormed.xml", null);
-// }
-
- public void testFile114() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testIllFormed2.xml", null);
- }
-// [249214] - XMLContentDescriber no longer returns content types for invalid encodings
-// public void testFile115() throws CoreException, IOException {
-// doTest("UTF-8 standalone=", "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
-// }
-
- public void testFile116() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testIllFormed4.xml", null);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTest("ISO-8859-1", "testfiles/xml/testMultiLine.xml", null);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoEncodingValue.xml", null);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNormalCase.xml", null);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
-// public void testFile123() throws CoreException, IOException {
-// doTest("UTF-16BE", "testfiles/xml/testUTF16.xml", null);
-// }
-
- public void testFile124() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- }
-
-// public void testFile126() throws CoreException, IOException {
-// doTest("UTF-16BE", "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", null);
-// }
-
-// public void testFile127() throws CoreException, IOException {
-// doTest("UTF-16BE", "testfiles/xml/utf16WithJapaneseChars.xml", null);
-// }
-
- public void testFile129() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
- public void testFile130() throws CoreException, IOException {
- doTest("UTF-16BE", "testfiles/xml/utf16be.xml", null);
- }
-
- public void testFile131() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/utf16le.xml", null);
- }
-
- public void testFile132() throws CoreException, IOException {
- doTest("UTF-16LE", "testfiles/xml/utf16leMalformed.xml", null);
- }
-
- public void testFile133() throws CoreException, IOException {
- doTest("UTF-16BE", "testfiles/xml/utf16beMalformed.xml", null);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java
deleted file mode 100644
index ea8d990..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java
+++ /dev/null
@@ -1,711 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding.read;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.GenerateFiles;
-
-
-
-public class TestContentTypeDescriptionOnGennedFiles extends TestContentDescription {
- private static int notRan = 0;
- private static final boolean DEBUG = false;
-
- protected void doGenTest(String charsetName) throws CoreException, IOException {
- String filename = GenerateFiles.getMainDirectoryBasedOnVMName() + "/xml/test-" + charsetName + ".xml";
- doTest(charsetName, filename, null);
- }
-
- protected void doTest(String expectedJavaCharset, String filePath, Class expectedException) throws CoreException, IOException {
- if (expectedJavaCharset != null && expectedJavaCharset.indexOf("UTF-32") > -1) {
- return; //won't try 32 bit right now
- }
- IFile file = (IFile) fTestProject.findMember(filePath);
-
- // if there no file, just assume that its due to which VM is
- // bring used. (Could be improved in future to avoid counting as a
- // test) - this check in here for initial debugging only
- if (file == null) {
- notRan++;
- if (DEBUG) {
- System.out.println();
- System.out.println("test not ran since charset not supported by VM: " + filePath);
- }
- return;
- }
- super.doTest(expectedJavaCharset, filePath, expectedException);
- }
-
-
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
-
- public void testFile1() throws CoreException, IOException {
- String charsetName = "CESU-8";
- doGenTest(charsetName);
- }
-
- public void testFile2() throws CoreException, IOException {
- String charsetName = "COMPOUND_TEXT";
- doGenTest(charsetName);
- }
-
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-CN";
- doGenTest(charsetName);
- }
-
- public void testFile4() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
-
- public void testFile5() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
-
- public void testFile6() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
-
- public void testFile7() throws CoreException, IOException {
- String charsetName = "GB2312";
- doGenTest(charsetName);
- }
-
- public void testFile8() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
-
- public void testFile9() throws CoreException, IOException {
- String charsetName = "hp-roman8";
- doGenTest(charsetName);
- }
-
- public void testFile10() throws CoreException, IOException {
- String charsetName = "IBM-1006";
- doGenTest(charsetName);
- }
-
- public void testFile11() throws CoreException, IOException {
- String charsetName = "IBM-1041";
- doGenTest(charsetName);
- }
-
- public void testFile12() throws CoreException, IOException {
- String charsetName = "IBM-1043";
- doGenTest(charsetName);
- }
-
- public void testFile13() throws CoreException, IOException {
- String charsetName = "IBM-1046";
- doGenTest(charsetName);
- }
-
- public void testFile14() throws CoreException, IOException {
- String charsetName = "IBM-1046S";
- doGenTest(charsetName);
- }
-
- public void testFile15() throws CoreException, IOException {
- String charsetName = "IBM-1088";
- doGenTest(charsetName);
- }
-
- public void testFile16() throws CoreException, IOException {
- String charsetName = "IBM-1098";
- doGenTest(charsetName);
- }
-
- public void testFile17() throws CoreException, IOException {
- String charsetName = "IBM-1114";
- doGenTest(charsetName);
- }
-
- public void testFile18() throws CoreException, IOException {
- String charsetName = "IBM-1115";
- doGenTest(charsetName);
- }
-
- public void testFile19() throws CoreException, IOException {
- String charsetName = "IBM-1124";
- doGenTest(charsetName);
- }
-
- public void testFile20() throws CoreException, IOException {
- String charsetName = "IBM-1363";
- doGenTest(charsetName);
- }
-
- public void testFile21() throws CoreException, IOException {
- String charsetName = "IBM-1363C";
- doGenTest(charsetName);
- }
-
- public void testFile22() throws CoreException, IOException {
- String charsetName = "IBM-1370";
- doGenTest(charsetName);
- }
-
- public void testFile23() throws CoreException, IOException {
- String charsetName = "IBM-1381";
- doGenTest(charsetName);
- }
-
- public void testFile24() throws CoreException, IOException {
- String charsetName = "IBM-1383";
- doGenTest(charsetName);
- }
-
- public void testFile25() throws CoreException, IOException {
- String charsetName = "IBM-1386";
- doGenTest(charsetName);
- }
-
- public void testFile26() throws CoreException, IOException {
- String charsetName = "IBM-33722C";
- doGenTest(charsetName);
- }
-
- public void testFile27() throws CoreException, IOException {
- String charsetName = "IBM-437";
- doGenTest(charsetName);
- }
-
- public void testFile28() throws CoreException, IOException {
- String charsetName = "IBM-737";
- doGenTest(charsetName);
- }
-
- public void testFile29() throws CoreException, IOException {
- String charsetName = "IBM-775";
- doGenTest(charsetName);
- }
-
- public void testFile30() throws CoreException, IOException {
- String charsetName = "IBM-808";
- doGenTest(charsetName);
- }
-
- public void testFile31() throws CoreException, IOException {
- String charsetName = "IBM-850";
- doGenTest(charsetName);
- }
-
- public void testFile32() throws CoreException, IOException {
- String charsetName = "IBM-852";
- doGenTest(charsetName);
- }
-
- public void testFile33() throws CoreException, IOException {
- String charsetName = "IBM-855";
- doGenTest(charsetName);
- }
-
- public void testFile34() throws CoreException, IOException {
- String charsetName = "IBM-856";
- doGenTest(charsetName);
- }
-
- public void testFile35() throws CoreException, IOException {
- String charsetName = "IBM-857";
- doGenTest(charsetName);
- }
-
- public void testFile36() throws CoreException, IOException {
- String charsetName = "IBM-858";
- doGenTest(charsetName);
- }
-
- public void testFile37() throws CoreException, IOException {
- String charsetName = "IBM-859";
- doGenTest(charsetName);
- }
-
- public void testFile38() throws CoreException, IOException {
- String charsetName = "IBM-860";
- doGenTest(charsetName);
- }
-
- public void testFile39() throws CoreException, IOException {
- String charsetName = "IBM-861";
- doGenTest(charsetName);
- }
-
- public void testFile40() throws CoreException, IOException {
- String charsetName = "IBM-862";
- doGenTest(charsetName);
- }
-
- public void testFile41() throws CoreException, IOException {
- String charsetName = "IBM-863";
- doGenTest(charsetName);
- }
-
- public void testFile42() throws CoreException, IOException {
- String charsetName = "IBM-864";
- doGenTest(charsetName);
- }
-
- public void testFile43() throws CoreException, IOException {
- String charsetName = "IBM-864S";
- doGenTest(charsetName);
- }
-
- public void testFile44() throws CoreException, IOException {
- String charsetName = "IBM-865";
- doGenTest(charsetName);
- }
-
- public void testFile45() throws CoreException, IOException {
- String charsetName = "IBM-866";
- doGenTest(charsetName);
- }
-
- public void testFile46() throws CoreException, IOException {
- String charsetName = "IBM-867";
- doGenTest(charsetName);
- }
-
- public void testFile47() throws CoreException, IOException {
- String charsetName = "IBM-868";
- doGenTest(charsetName);
- }
-
- public void testFile48() throws CoreException, IOException {
- String charsetName = "IBM-869";
- doGenTest(charsetName);
- }
-
- public void testFile49() throws CoreException, IOException {
- String charsetName = "IBM-874";
- doGenTest(charsetName);
- }
-
- public void testFile50() throws CoreException, IOException {
- String charsetName = "IBM-897";
- doGenTest(charsetName);
- }
-
- public void testFile51() throws CoreException, IOException {
- String charsetName = "IBM-921";
- doGenTest(charsetName);
- }
-
- public void testFile52() throws CoreException, IOException {
- String charsetName = "IBM-922";
- doGenTest(charsetName);
- }
-
- public void testFile53() throws CoreException, IOException {
- String charsetName = "IBM-932";
- doGenTest(charsetName);
- }
-
- public void testFile54() throws CoreException, IOException {
- String charsetName = "IBM-942";
- doGenTest(charsetName);
- }
-
- public void testFile55() throws CoreException, IOException {
- String charsetName = "IBM-942C";
- doGenTest(charsetName);
- }
-
- public void testFile56() throws CoreException, IOException {
- String charsetName = "IBM-943";
- doGenTest(charsetName);
- }
-
- public void testFile57() throws CoreException, IOException {
- String charsetName = "IBM-943C";
- doGenTest(charsetName);
- }
-
- public void testFile58() throws CoreException, IOException {
- String charsetName = "IBM-948";
- doGenTest(charsetName);
- }
-
- public void testFile59() throws CoreException, IOException {
- String charsetName = "IBM-949";
- doGenTest(charsetName);
- }
-
- public void testFile60() throws CoreException, IOException {
- String charsetName = "IBM-949C";
- doGenTest(charsetName);
- }
-
- public void testFile61() throws CoreException, IOException {
- String charsetName = "IBM-950";
- doGenTest(charsetName);
- }
-
- public void testFile62() throws CoreException, IOException {
- String charsetName = "IBM-954C";
- doGenTest(charsetName);
- }
-
- public void testFile63() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN";
- doGenTest(charsetName);
- }
-
- public void testFile64() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN-GB";
- doGenTest(charsetName);
- }
-
- public void testFile65() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
-
- public void testFile66() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
-
- public void testFile67() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
-
- public void testFile68() throws CoreException, IOException {
- String charsetName = "ISO-8859-10";
- doGenTest(charsetName);
- }
-
- public void testFile69() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
-
- public void testFile70() throws CoreException, IOException {
- String charsetName = "ISO-8859-14";
- doGenTest(charsetName);
- }
-
- public void testFile71() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
-
- public void testFile72() throws CoreException, IOException {
- String charsetName = "ISO-8859-16";
- doGenTest(charsetName);
- }
-
- public void testFile73() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
-
- public void testFile74() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
-
- public void testFile75() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
-
- public void testFile76() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
-
- public void testFile77() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
-
- public void testFile78() throws CoreException, IOException {
- String charsetName = "ISO-8859-6S";
- doGenTest(charsetName);
- }
-
- public void testFile79() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
-
- public void testFile80() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
-
- public void testFile81() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
-
- public void testFile82() throws CoreException, IOException {
- String charsetName = "JIS0201";
- doGenTest(charsetName);
- }
-
- public void testFile83() throws CoreException, IOException {
- String charsetName = "JIS0208";
- doGenTest(charsetName);
- }
-
- public void testFile84() throws CoreException, IOException {
- String charsetName = "JIS0212";
- doGenTest(charsetName);
- }
-
- public void testFile85() throws CoreException, IOException {
- String charsetName = "Johab";
- doGenTest(charsetName);
- }
-
- public void testFile86() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
-
- public void testFile87() throws CoreException, IOException {
- String charsetName = "KOI8-RU";
- doGenTest(charsetName);
- }
-
- public void testFile88() throws CoreException, IOException {
- String charsetName = "KOI8-U";
- doGenTest(charsetName);
- }
-
- public void testFile89() throws CoreException, IOException {
- String charsetName = "KSC5601";
- doGenTest(charsetName);
- }
-
- public void testFile90() throws CoreException, IOException {
- String charsetName = "MacArabic";
- doGenTest(charsetName);
- }
-
- public void testFile91() throws CoreException, IOException {
- String charsetName = "MacCentralEurope";
- doGenTest(charsetName);
- }
-
- public void testFile92() throws CoreException, IOException {
- String charsetName = "MacCroatian";
- doGenTest(charsetName);
- }
-
- public void testFile93() throws CoreException, IOException {
- String charsetName = "MacCyrillic";
- doGenTest(charsetName);
- }
-
- public void testFile94() throws CoreException, IOException {
- String charsetName = "MacGreek";
- doGenTest(charsetName);
- }
-
- public void testFile95() throws CoreException, IOException {
- String charsetName = "MacHebrew";
- doGenTest(charsetName);
- }
-
- public void testFile96() throws CoreException, IOException {
- String charsetName = "MacIceland";
- doGenTest(charsetName);
- }
-
- public void testFile97() throws CoreException, IOException {
- String charsetName = "MacRoman";
- doGenTest(charsetName);
- }
-
- public void testFile98() throws CoreException, IOException {
- String charsetName = "MacRomania";
- doGenTest(charsetName);
- }
-
- public void testFile99() throws CoreException, IOException {
- String charsetName = "MacThai";
- doGenTest(charsetName);
- }
-
- public void testFile100() throws CoreException, IOException {
- String charsetName = "MacTurkish";
- doGenTest(charsetName);
- }
-
- public void testFile101() throws CoreException, IOException {
- String charsetName = "MacUkraine";
- doGenTest(charsetName);
- }
-
- public void testFile102() throws CoreException, IOException {
- String charsetName = "PTCP154";
- doGenTest(charsetName);
- }
-
- public void testFile103() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
-
- public void testFile104() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
-
- public void testFile105() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
-
- public void testFile106() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
-
-// public void testFile107() throws CoreException, IOException {
-// String charsetName = "UTF-16BE";
-// doGenTest(charsetName);
-// }
-
- public void testFile108() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
-
- public void testFile109() throws CoreException, IOException {
- String charsetName = "UTF-32";
- doGenTest(charsetName);
- }
-
- public void testFile110() throws CoreException, IOException {
- String charsetName = "UTF-32BE";
- doGenTest(charsetName);
- }
-
- public void testFile111() throws CoreException, IOException {
- String charsetName = "UTF-32LE";
- doGenTest(charsetName);
- }
-
- public void testFile112() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
-
- public void testFile113() throws CoreException, IOException {
- String charsetName = "UTF-8J";
- doGenTest(charsetName);
- }
-
- public void testFile114() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
-
- public void testFile115() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
-
- public void testFile116() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
-
- public void testFile117() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
-
- public void testFile118() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
-
- public void testFile119() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
-
- public void testFile120() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
-
- public void testFile121() throws CoreException, IOException {
- String charsetName = "windows-1256S";
- doGenTest(charsetName);
- }
-
- public void testFile122() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
-
- public void testFile123() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
-
- public void testFile124() throws CoreException, IOException {
- String charsetName = "windows-874";
- doGenTest(charsetName);
- }
-
- public void testFile125() throws CoreException, IOException {
- String charsetName = "windows-932";
- doGenTest(charsetName);
- }
-
- public void testFile126() throws CoreException, IOException {
- String charsetName = "windows-936";
- doGenTest(charsetName);
- }
-
- public void testFile127() throws CoreException, IOException {
- String charsetName = "windows-949";
- doGenTest(charsetName);
- }
-
- public void testFile128() throws CoreException, IOException {
- String charsetName = "windows-950";
- doGenTest(charsetName);
- }
-/*
-removed for PPC machine with IBM VM
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
-*/
-// public void testFile129() throws CoreException, IOException {
-// String charsetName = "X-UnicodeBig";
-// doGenTest(charsetName);
-// }
-
- public void testFile130() throws CoreException, IOException {
- String charsetName = "X-UnicodeLittle";
- doGenTest(charsetName);
- }
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java
deleted file mode 100644
index 6b20eda..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-import org.eclipse.wst.xml.tests.encoding.util.ProjectUnzipUtility;
-
-
-public class TestContentTypeDetection extends TestCase {
- private static final boolean DEBUG = false;
- static IProject fTestProject;
- // needs to be static, since JUnit creates difference instances for each
- // test
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.xml.temp.tests.encoding.resource.newtests";
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- private static void getAndCreateProject() throws CoreException {
- IWorkspace workspace = TestsPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- // createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- }
-
- /**
- *
- */
- public TestContentTypeDetection() {
- super();
- // System.out.println(currentPlatformCharset);
- }
-
- protected void doTest(String expectedContentType, String filePath, Class expectedException) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
- IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
- IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
- IContentType fileContentType = fileContentDescription.getContentType();
- assertNotNull("file content type was null", fileContentType);
-
- IContentType streamContentType = streamContentDescription.getContentType();
- assertNotNull("stream content type was null", streamContentType);
-
- assertEquals("comparing content type based on file and stream: ", fileContentType, streamContentType);
-
- // if equal, above, as expected, then only need to check one.
- assertEquals("compareing with expected content type id", expectedContentType, fileContentType.getId());
-
- }
-
- protected IContentDescription doGetContentTypeBasedOnStream(IFile file) throws CoreException, IOException {
- IContentDescription streamContentDescription = null;
- InputStream inputStream = null;
- try {
- inputStream = file.getContents();
- streamContentDescription = Platform.getContentTypeManager().getDescriptionFor(inputStream, file.getName(), IContentDescription.ALL);
- }
- finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- assertNotNull("content description was null", streamContentDescription);
- return streamContentDescription;
- }
-
- protected IContentDescription doGetContentTypeBasedOnFile(IFile file) throws CoreException {
- IContentDescription fileContentDescription = file.getContentDescription();
- assertNotNull("file content description was null", fileContentDescription);
- return fileContentDescription;
- }
-
- protected void doTestForParent(String expectedContentType, String filePath, Class expectedException) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
- IContentDescription contentDescription = file.getContentDescription();
- if (contentDescription == null) {
- InputStream inputStream = null;
- try {
- inputStream = file.getContents();
- contentDescription = Platform.getContentTypeManager().getDescriptionFor(inputStream, file.getName(), IContentDescription.ALL);
- }
- finally {
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
- assertNotNull("content description was null", contentDescription);
- IContentType contentType = contentDescription.getContentType();
- assertNotNull("content type was null", contentType);
-
- IContentType parentContentType = contentType;
- boolean found = false;
- while (parentContentType != null && !found) {
- found = expectedContentType.equals(parentContentType.getId());
- parentContentType = parentContentType.getBaseType();
- }
- assertTrue("did not find '" + expectedContentType + "' in parent chain of base types", found);
-
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = TestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
-// Display display = PlatformUI.getWorkbench().getDisplay();
-// display.asyncExec(new Runnable() {
-// public void run() {
-// ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-// IProject proj = fTestProject;
-// fTestProject = null;
-// try {
-// projUtil.deleteProject(proj);
-// }
-// catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-// });
- }
- }
- }
-
- protected static IProject getTestProject() {
- return fTestProject;
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
deleted file mode 100644
index a20afa2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-
-public class TestContentTypeDetectionForXML extends TestContentTypeDetection {
- private static final String expectedCustomXMLContentType = "org.eclipse.wst.xml.core.xmlsource";
-
-// private static final String expectedXSLContentType = "org.eclipse.wst.xml.core.xslsource";
-
- private static final String expectedXMLContentType = "org.eclipse.core.runtime.xml";
-
- public void testFile103() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile103P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/EmptyFile.xml", null);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/eucjp.xml", null);
- }
-
- public void testFile104b() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/eucjp.xml", null);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/IllformedNormalNonDefault.xml", null);
- }
-// [251786] - No encoding should try to be picked up by the org.eclipse.wst.xml.core.xmlsource
-// public void testFile106() throws CoreException, IOException {
-// doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
-// }
-
- /**
- * This file is illformed in its specified charset
- * and characters.
- * @throws CoreException
- * @throws IOException
- */
-// [251786] - No encoding should try to be picked up by the org.eclipse.wst.xml.core.xmlsource
-// public void testFile107() throws CoreException, IOException {
-// doTest(expectedXSLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
-// }
-// [251786] - No encoding should try to be picked up by the org.eclipse.wst.xml.core.xmlsource
-// public void testFile107P() throws CoreException, IOException {
-// doTestForParent(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
-// }
-
- public void testFile108() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/NoEncoding.xml", null);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/NormalNonDefault.xml", null);
- }
-
-
- public void testFile110() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/shiftjis.xml", null);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testExtraJunk.xml", null);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testExtraValidStuff.xml", null);
- }
- // [250392] the version number is illformed and should not be parsed correctly by the XMLContentDescriber.
- // Might be able to fix when [251786] is corrected
-// public void testFile113() throws CoreException, IOException {
-// doTest(expectedXMLContentType, "testfiles/xml/testIllFormed.xml", null);
-// }
-
- public void testFile114() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testIllFormed2.xml", null);
- }
-
- // [250392] the version number is illformed and should not be parsed correctly by the XMLContentDescriber.
- // Might be able to fix when [251786] is corrected
-// public void testFile115() throws CoreException, IOException {
-// doTest(expectedXMLContentType, "testfiles/xml/testIllFormed3.xml", java.nio.charset.IllegalCharsetNameException.class);
-// }
-
- public void testFile116() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testIllFormed4.xml", null);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testMultiLine.xml", null);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNoEncodingValue.xml", null);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNormalCase.xml", null);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile120WS() throws CoreException, IOException {
- // whitespace (CRLF) before xml declaration
- doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl.xml", null);
- }
-
- public void testFile120WS2() throws CoreException, IOException {
- // whitespace (space only) before xml declaration
- doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl2.xml", null);
- }
-
- public void testFile120WS3() throws CoreException, IOException {
- // whitespace (space, tabs, and CR only) before xml declaration
- doTest(expectedCustomXMLContentType, "testfiles/xml/testWSBeforeXMLDecl3.xml", null);
- }
-
- public void testFile120P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- // tag (not just white space) before xml declaration.
- doTest(expectedXMLContentType, "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile121P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDeclAtFirst.xml", null);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
- public void testFile122P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDeclInLargeFile.xml", null);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/testUTF16.xml", null);
- }
-
- public void testFile124() throws CoreException, IOException {
- // large, utf16, but no xmlDecl
- doTest(expectedXMLContentType, "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile124P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile125() throws CoreException, IOException {
- // illformed, is in utf16, but not in header, not in encoding= spec.
- doTest(expectedXMLContentType, "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- }
-
- public void testFile125P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", null);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", null);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/utf16WithJapaneseChars.xml", null);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
- public void testFile129() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16be.xml", null);
- }
-
- public void testFile130() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16le.xml", null);
- }
-
- public void testFile131() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16beMalformed.xml", null);
- }
-
- public void testFile132() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/utf16leMalformed.xml", null);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java
deleted file mode 100644
index b5a6167..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.read;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-
-
-public class TestContentTypes extends TestCase {
- private static final boolean DEBUG = false;
-
- public void testCreation() {
- IContentTypeManager registry = Platform.getContentTypeManager();
- assertTrue("content type identifer registry must exist", registry != null);
- IContentType[] allTypes = registry.getAllContentTypes();
- for (int i = 0; i < allTypes.length; i++) {
- IContentType contentType = allTypes[i];
- IContentType parentType = contentType.getBaseType();
- if (DEBUG) {
- System.out.print(contentType);
-
- if (parentType != null) {
- System.out.println(" (extends " + parentType + ")");
- }
- else {
- System.out.println();
- }
- System.out.println(" " + contentType.getName());
- }
- String[] filespecs = contentType.getFileSpecs(IContentType.FILE_EXTENSION_SPEC | IContentType.FILE_NAME_SPEC);
- if (DEBUG) {
- for (int j = 0; j < filespecs.length; j++) {
- String filespec = filespecs[j];
- System.out.println(" " + filespec);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java
deleted file mode 100644
index 8dad582..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.util;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-/**
- * Imports zipped files into the test workspace. Deletes all projects in
- * workspace.
- *
- * @author pavery
- */
-public class ProjectUnzipUtility {
- class MyOverwriteQuery implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return ALL;
- }
- }
-
- public final static String PROJECT_ZIPS_FOLDER = "ProjectTestFiles";
- private List fCreatedProjects = null;
-
- public ProjectUnzipUtility() {
- // for deletion later
- fCreatedProjects = new ArrayList();
- }
-
- /**
- * @param fileToImport
- * the file you wish to import
- * @param folderPath
- * the container path within the workspace
- */
- public void importFile(File fileToImport, String folderPath) {
- WorkspaceProgressMonitor importProgress = new WorkspaceProgressMonitor();
- try {
- if (fileToImport.exists()) {
- IPath containerPath = new Path(folderPath);
- //fCreatedProjects.add(folderPath);
- IImportStructureProvider provider = FileSystemStructureProvider.INSTANCE;
- IOverwriteQuery overwriteImplementor = new MyOverwriteQuery();
- File[] filesToImport = {fileToImport};
- ImportOperation importOp = new ImportOperation(containerPath, null, provider, overwriteImplementor, Arrays.asList(filesToImport));
- importOp.setCreateContainerStructure(false);
- importOp.setOverwriteResources(true);
- importOp.run(importProgress);
- }
- else {
- System.out.println("handle source doesn't exist");
- }
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
- finally {
- importProgress.done();
- }
- }
-
- /**
- * the following is logic from
- * http://www.devshed.com/c/a/Java/Zip-Meets-Java/2/
- */
- // specify buffer size for extraction
- static final int BUFFER = 2048;
-
- public void unzipAndImport(File inFile, String destinationDirectory) {
- try {
- // Specify file to decompress
- String inFileName = inFile.getAbsolutePath(); //"c:/example.zip";
- // Specify destination where file will be unzipped
- //String destinationDirectory =
- // "d:/eclipsedev/M5_SSE_TESTS_WORKSPACE/"; //"c:/temp/";
- File sourceZipFile = new File(inFileName);
- File unzipDestinationDirectory = new File(destinationDirectory);
- // Open Zip file for reading
- ZipFile zipFile = new ZipFile(sourceZipFile, ZipFile.OPEN_READ);
- // Create an enumeration of the entries in the zip file
- Enumeration zipFileEntries = zipFile.entries();
- String projectFolderName = null;
- IProject currentProject = null;
- // Process each entry
- while (zipFileEntries.hasMoreElements()) {
- // grab a zip file entry
- ZipEntry entry = (ZipEntry) zipFileEntries.nextElement();
- String currentEntry = entry.getName();
- //System.out.println("Extracting: " + entry);
- File destFile = new File(unzipDestinationDirectory, currentEntry);
- // grab file's parent directory structure
- File destinationParent = destFile.getParentFile();
- // create the parent directory structure if needed
- destinationParent.mkdirs();
- // extract file if not a directory
- if (!entry.isDirectory()) {
- BufferedInputStream is = new BufferedInputStream(zipFile.getInputStream(entry));
- // establish buffer for writing file
- byte data[] = new byte[BUFFER];
- // write the current file to disk
- FileOutputStream fileOutputStream = new FileOutputStream(destFile);
- ByteArrayOutputStream dest = new ByteArrayOutputStream(BUFFER);
- // read and write until last byte is encountered
- boolean eof = false;
- int nBytes = 0;
- while (!eof) {
- nBytes = is.read(data, 0, BUFFER);
- if (nBytes != -1) {
- dest.write(data, 0, nBytes);
- }
- else {
- eof = true;
- }
- }
- dest.flush();
- dest.close();
- fileOutputStream.write(dest.toByteArray());
- fileOutputStream.close();
- is.close();
- if (projectFolderName != null)
- importFile(destFile, projectFolderName);
- }
- else {
- // need handle to the main project folder to create
- // containerPath
- // unlike version in sse.tests, we don't create project
- // for
- // every directory
- // if(projectFolderName == null) {
- // projectFolderName = destFile.getName();
- // fCreatedProjects.add(projectFolderName);
- //
- // currentProject =
- // ResourcesPlugin.getWorkspace().getRoot().getProject(projectFolderName);
- // }
- }
- }
- zipFile.close();
- // fixes workspace metadata for the project
- // for clean startup next run
- if (currentProject != null) {
- try {
- Path projectLocation = new Path(Platform.getLocation().toOSString());
- createProject(currentProject, projectLocation, new WorkspaceProgressMonitor());
- }
- catch (CoreException cex) {
- cex.printStackTrace();
- }
- }
- }
- catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
-
- /**
- *
- */
- public void refreshWorkspace() throws CoreException {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject[] projects = wsRoot.getProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].refreshLocal(IResource.DEPTH_INFINITE, null);
- }
- wsRoot.refreshLocal(IResource.DEPTH_INFINITE, null);
- }
-
- /**
- * Delete projects created (unzipped and imported) by this utility
- *
- * @throws Exception
- */
- public void deleteProjects() throws Exception {
- final IProject[] projects = getCreatedProjects();
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < projects.length; i++) {
- projects[i].clearHistory(null);
- projects[i].close(null);
- projects[i].delete(true, true, null);
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- public void deleteProject(String projectName) throws Exception {
- final String name = projectName;
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- final IProject proj = wsRoot.getProject(name);
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- try {
- proj.delete(true, true, null);
- }
- catch (Exception e) {
- // just try again (not sure why they are not being
- // deleted)
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- }
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(progress);
- // saves the new workspace metadata
- ResourcesPlugin.getWorkspace().save(true, null);
- }
-
- /**
- * @return IProjects that were unzipped and imported into the workspace by
- * this utility
- */
- public IProject[] getCreatedProjects() {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- String[] projectNames = (String[]) fCreatedProjects.toArray(new String[fCreatedProjects.size()]);
- IProject[] projects = new IProject[projectNames.length];
- for (int i = 0; i < projectNames.length; i++) {
- projects[i] = wsRoot.getProject(projectNames[i]);
- }
- return projects;
- }
-
- public void initJavaProject(String projName) throws CoreException {
- // resynch
- refreshWorkspace();
- //change prereqs to get this functionality back in
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- // need to add java nature, or else project won't "exist()" in the
- // java element sense
- String[] natureIds = {"org.eclipse.jdt.core.javanature"};
- if (!proj.isOpen()) {
- proj.open(null);
- }
- IProjectDescription desc = proj.getDescription();
- desc.setNatureIds(natureIds);
- proj.setDescription(desc, null);
- }
-
- private void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new WorkspaceProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- public void deleteProject(IProject fProject) throws InvocationTargetException, InterruptedException {
- final IProject proj = fProject;
- WorkspaceModifyOperation deleteOp = new WorkspaceModifyOperation(proj) {
- protected void execute(IProgressMonitor monitor) throws CoreException {
- // IWorkspaceRoot wsRoot =
- // ResourcesPlugin.getWorkspace().getRoot();
- // IProject proj = wsRoot.getProject(name);
- if (proj != null && proj.exists()) {
- proj.clearHistory(null);
- //proj.close(null);
- proj.refreshLocal(IResource.DEPTH_INFINITE, null);
- proj.delete(true, true, null);
- //proj = null;
- }
- refreshWorkspace();
- }
- };
- //WorkspaceProgressMonitor progress = new WorkspaceProgressMonitor();
- deleteOp.run(null);
- // saves the new workspace metadata
- //ResourcesPlugin.getWorkspace().save(true, null);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java
deleted file mode 100644
index 7d7f7d3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.util;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
- private boolean finished = false;
-
- public void beginTask(String name, int totalWork) {
- // noop
- }
-
- public void done() {
- finished = true;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void internalWorked(double work) {
- // noop
- }
-
- public boolean isCanceled() {
- return finished;
- }
-
- public void setCanceled(boolean value) {
- if (value == true)
- finished = true;
- }
-
- public void setTaskName(String name) {
- // noop
- }
-
- public void subTask(String name) {
- // noop
- }
-
- public void worked(int work) {
- // noop
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java
deleted file mode 100644
index 112521f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.write;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.internal.encoding.CodedStreamCreator;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingRule;
-
-public class TestCodedWrite extends TestCase {
- /** A table of hex digits */
- private static final char[] hexDigit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- private static StringBuffer sBuff = new StringBuffer(2);
-
- private static String byteToHex(byte bytechar) {
- sBuff.setLength(0);
- int low = bytechar & 0xF;
- int hi = (bytechar >> 4) & 0xF;
- sBuff.append(toHex(hi));
- sBuff.append(toHex(low));
- return sBuff.toString();
- }
-
- /**
- * Convert a nibble to a hex character
- *
- * @param nibble
- * the nibble to convert.
- */
- private static char toHex(int nibble) {
- return hexDigit[(nibble & 0xF)];
- }
-
- private boolean DEBUG = false;
-
- /**
- *
- */
- public TestCodedWrite() {
- super();
- }
-
- /**
- * @param name
- */
- public TestCodedWrite(String name) {
- super(name);
- }
-
- public void testSimple() throws UnsupportedEncodingException, CoreException, IOException {
- String jsp = "<%@ page contentType=\"text/html; charset=ISO-8859-3\"%>";
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- codedStreamCreator.set("dummy.jsp", jsp);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimple", jsp, "ISO-8859-3", outputStream);
- }
- assertNotNull(outputStream);
-
- }
-
- private void debugPrint(String testname, String originalString, String encoding, ByteArrayOutputStream outputStream) throws UnsupportedEncodingException {
- System.out.println();
- System.out.println(testname);
- byte[] bytes = outputStream.toByteArray();
- for (int i = 0; i < bytes.length; i++) {
- System.out.print(byteToHex(bytes[i]));
- }
- System.out.println();
- if (encoding == null) {
- System.out.println(new String(bytes));
-
- }
- else {
- System.out.println(new String(bytes, encoding));
- }
- }
-
- public void testSimpleUTF16BE() throws UnsupportedEncodingException, CoreException, IOException {
- String jsp = "<%@ page contentType=\"text/html; charset=UTF-16BE\"%>";
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- codedStreamCreator.set("dummy.jsp", jsp);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimpleUTF16BE", jsp, "UTF-16BE", outputStream);
- }
- assertNotNull(outputStream);
-
- }
-
- public void testSimpler() throws UnsupportedEncodingException, CoreException, IOException {
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- String xmlString = "<?xml version=\"1.0\" encoding=\"UTF-16\"?><tag>test text</tag>";
- codedStreamCreator.set("dummy.xml", xmlString);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimpler", xmlString, "UTF-16", outputStream);
- }
- assertNotNull(outputStream);
-
- }
-
- public void testSimplest() throws UnsupportedEncodingException, CoreException, IOException {
- CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
- String text = "test text";
- codedStreamCreator.set("dummy.xml", text);
- ByteArrayOutputStream outputStream = codedStreamCreator.getCodedByteArrayOutputStream(EncodingRule.CONTENT_BASED);
- if (DEBUG) {
- debugPrint("testSimplest", text, null, outputStream);
- }
- assertNotNull(outputStream);
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java
deleted file mode 100644
index 0ab1c8e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.xml;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-
-
-public class XMLEncodingTests extends TestCase {
- private int READ_BUFFER_SIZE = 8000;
- private boolean DEBUG = false;
- private final String fileRoot = "testfiles/";
- private final String fileDir = "xml/";
- private final String fileLocation = fileRoot + fileDir;
-
- public XMLEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = TestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- //InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((XMLResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail) if throws exception.
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- public void testXMLEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.xml";
- doTestFileStream(filename, "UTF-8", new XMLResourceEncodingDetector());
- }
-
- public void testXMLIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.xml";
- String ianaInFile = "ISO-8859-1";
- doTestFileStream(filename, ianaInFile, new XMLResourceEncodingDetector());
- }
-
- public void testXMLNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.xml";
- String ianaInFile = "ISO-8859-1";
- doTestFileStream(filename, ianaInFile, new XMLResourceEncodingDetector());
- }
-
- public void testXMLNoEncoding() throws IOException {
- String filename = fileLocation + "NoEncoding.xml";
- doTestFileStream(filename, "UTF-8", new XMLResourceEncodingDetector());
- }
-
- /**
- * Caution, when this file prints out in console (when debug set to true, it appears
- * incorrect (due to font problems in console).
- */
- public void testUTF16() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.xml";
- doTestFileStream(filename, "UTF-16", new XMLResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.xml";
- doTestFileStream(filename, "UTF-16", new XMLResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- * Note: UTF-16 == UTF-16BE
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.xml";
- doTestFileStream(filename, "UTF-16", new XMLResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.xml";
- doTestFileStream(filename, "UTF-8", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16BE() throws IOException {
- String filename = fileLocation + "utf16be.xml";
- doTestFileStream(filename, "UTF-16BE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16LE() throws IOException {
- String filename = fileLocation + "utf16le.xml";
- doTestFileStream(filename, "UTF-16LE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16LEMalformed() throws IOException {
- String filename = fileLocation + "utf16leMalformed.xml";
- doTestFileStream(filename, "UTF-16LE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF16BEMalformed() throws IOException {
- String filename = fileLocation + "utf16beMalformed.xml";
- doTestFileStream(filename, "UTF-16BE", new XMLResourceEncodingDetector());
- }
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java
deleted file mode 100644
index d03c374..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding.xml;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizer;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-
-
-public class XMLHeadTokenizerTester extends TestCase {
-
- private boolean DEBUG = false;
- private final String fileDir = "xml/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fEncoding = null;
- private HeadParserToken fFinalToken;
-
- private void doTestFile(String filename, String expectedName) {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String expectedFinalTokenType) {
-
- XMLHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = TestsPlugin.getByteReader(filename);
- tokenizer = new XMLHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- String resultValue = null;
- try {
- parse(tokenizer);
- resultValue = fEncoding;
- if (DEBUG) {
- System.out.println("XML Head Tokenizer Found Encoding: " + resultValue);
- }
- fileReader.close();
- }
- catch (java.io.IOException e) {
- System.out.println("An I/O error occured while scanning :");
- System.out.println(e);
- }
-
- if (expectedFinalTokenType != null) {
- assertTrue("did not end as expected. found: " + fFinalToken.getType(), expectedFinalTokenType.equals(fFinalToken.getType()));
- }
- else {
- if (expectedName == null) {
- // TODO: this test branch needs to be improved ... doesn't
- // fail
- // as it should
- // (such as when tokenizer changed to return early when
- // Unicode
- // stream found).
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
- }
-
- }
-
- private void parse(XMLHeadTokenizer tokenizer) throws IOException {
- HeadParserToken token = null;
- String tokenType = null;
- do {
- token = tokenizer.getNextToken();
- tokenType = token.getType();
- // normally "parsing" the tokens should be done by parser
- // @see, XMLResourceEncodoingDetector
- // but we'll
- // do it here for a little
- // more independent test.
- if (tokenType == EncodingParserConstants.UTF16BE) {
- fEncoding = "UTF16BEInStream";
- }
- if (tokenType == EncodingParserConstants.UTF16LE) {
- fEncoding = "UTF16LEInStream";
- }
- if (tokenType == EncodingParserConstants.UTF83ByteBOM) {
- fEncoding = "UTF83ByteBOMInStream";
- }
- if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- token = tokenizer.getNextToken();
- tokenType = token.getType();
- if (isLegalString(tokenType)) {
- fEncoding = token.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- // for testing
- fFinalToken = token;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * Normal XMLDeclaration with default encoding specified (UTF-8)
- *
- */
- public void testBestCase() {
- String filename = fileLocation + "testNormalCase.xml";
- doTestFile(filename, "UTF-8");
-
- }
-
- /**
- * This is a UTF-16 file (Unicode bytes in BOM). So, the tokenizer by
- * itself can't read correctly. Returns null in "pure" tokenizer test, but
- * encoding detector case should still handle since looks for bytes first.
- */
- public void testUTF16() {
- String filename = fileLocation + "testUTF16.xml";
- doTestFile(filename, "UTF16BEInStream");
- }
-
- /**
- * Just to make sure we don't choke on empty file.
- *
- */
- public void testEmptyFile() {
- String filename = fileLocation + "EmptyFile.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testEUCJP() {
- String filename = fileLocation + "eucjp.xml";
- doTestFile(filename, "EUC-JP");
- }
-
- /**
- * Extended XML Declaration that contains 'standalone' attribute
- *
- */
- public void testExtraAttrCase() {
- String filename = fileLocation + "testExtraValidStuff.xml";
- doTestFile(filename, "UTF-8");
-
- }
-
- /**
- * A case with a valid encoding, but extra attributes which are not
- * valid/meaningful.
- *
- */
- public void testExtraJunkCase() {
- String filename = fileLocation + "testExtraJunk.xml";
- doTestFile(filename, "ISO-8859-1");
- }
-
- /**
- * Missing 2 quotes, one and end of version value and one at beginning of
- * encoding value. In this case, tokenizer handles as undelimite string,
- * but if we ever modifiy to also look for 'version', then would not work
- * the same.
- *
- */
- public void testIllFormed() {
- String filename = fileLocation + "testIllFormed.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Missing XMLDecl end tag ... we should be able to safely guess.
- *
- */
- public void testIllFormed2() {
- String filename = fileLocation + "testIllFormed2.xml";
- doTestFile(filename, "UTF-8");
- }
-
- /**
- * Missing end quote on UTF-8 attribute, so picks up following attribte
- * too.
- *
- */
- public void testIllFormed3() {
- String filename = fileLocation + "testIllFormed3.xml";
- doTestFile(filename, "UTF-8 standalone=");
- }
-
- /**
- * Missing end quote on UTF-8 attribute, but then XMLDeclEnds, so should
- * be able to handle
- *
- */
- public void testIllFormed4() {
- String filename = fileLocation + "testIllFormed4.xml";
- doTestFile(filename, "UTF-8");
- }
-
- /**
- * Test of missing end quote on encoding value.
- *
- */
- public void testIllformedNormalNonDefault() {
- String filename = fileLocation + "IllformedNormalNonDefault.xml";
- doTestFile(filename, "ISO-8859-1");
- }
-
- /**
- * Empty string as encoding value; (And, malformed input, for UTF-8 ...
- * should not effect results of this level of test).
- *
- */
- public void testMalformedNoEncoding() {
- String filename = fileLocation + "MalformedNoEncoding.xml";
- doTestFile(filename, "");
- }
-
- /**
- * Empty string as encoding value; (And, malformed input, for UTF-8 ...
- * should not effect results of this level of test).
- *
- */
- public void testMalformedNoEncodingXSL() {
- String filename = fileLocation + "MalformedNoEncoding.xsl";
- doTestFile(filename, "");
- }
-
- /**
- * XMLDeclaration not all on same line
- *
- */
- public void testMultiLineCase() {
- String filename = fileLocation + "testMultiLine.xml";
- doTestFile(filename, "ISO-8859-1");
-
- }
-
- /**
- * No encoding in XMLDeclaration
- *
- */
- public void testNoEncoding() {
- String filename = fileLocation + "NoEncoding.xml";
- doTestFile(filename, null);
- }
-
- /**
- * ?Is this a dup?
- *
- */
- public void testNoEncodingCase() {
- String filename = fileLocation + "testNoEncodingValue.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Normal XMLDeclaration with ISO-1 specified
- *
- */
- public void testNormalNonDefault() {
- String filename = fileLocation + "NormalNonDefault.xml";
- doTestFile(filename, "ISO-8859-1");
- }
-
- /**
- * No XMLDeclaration at all. (Invalid, but should still be able to parse).
- *
- */
- public void testNoXMLDecl() {
- String filename = fileLocation + "testNoXMLDecl.xml";
- doTestFile(filename, null);
- }
-
- /**
- * Hard to handle safely (may appear in comment, for example).
- *
- */
- public void testNoXMLDeclAtFirst() {
- String filename = fileLocation + "testNoXMLDeclAtFirst.xml";
- doTestFile(filename, null);
- }
-
- /**
- * This test is just to make sure the scanning ends before end of file is
- * reached.
- *
- */
- public void testNoXMLDeclInLargeFile() {
- String filename = fileLocation + "testNoXMLDeclInLargeFile.xml";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testshiftjis() {
- String filename = fileLocation + "shiftjis.xml";
- doTestFile(filename, "Shift_JIS");
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testUTF16LEWithJapaneseChars() {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.xml";
- doTestFile(filename, "UTF16LEInStream");
- }
-
- /**
- * Testing as a result of CMVC defect 217720
- */
- public void testUTF16BEWithJapaneseChars() {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.xml";
- doTestFile(filename, "UTF16BEInStream");
- }
-
- /**
- * A common case.
- *
- */
- public void testUTF8With3ByteBOM() {
- String filename = fileLocation + "UTF8With3ByteBOM.xml";
- doTestFile(filename, "UTF83ByteBOMInStream");
- }
- public void UTF16LEAtStartOfLargeFile() {
- String filename = fileLocation + "UTF16LEAtStartOfLargeFile.xml";
- doTestFile(filename, "UTF16LEInStream");
- }
-
- public void testUTF16LE() {
- String filename = fileLocation + "utf16le.xml";
- doTestFile(filename, "UTF-16LE");
- }
-
- public void testUTF16BE() {
- String filename = fileLocation + "utf16be.xml";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16BEMalformed() {
- String filename = fileLocation + "utf16beMalformed.xml";
- doTestFile(filename, "UTF-16BE");
- }
-
- public void testUTF16LEMalformed() {
- String filename = fileLocation + "utf16leMalformed.xml";
- doTestFile(filename, "UTF-16LE");
- }
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java
deleted file mode 100644
index 8be099a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 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.tests.encoding.xml;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.nio.charset.MalformedInputException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-import org.eclipse.wst.sse.core.internal.exceptions.MalformedInputExceptionWithDetail;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-import org.eclipse.wst.xml.tests.encoding.TestsPlugin;
-
-/**
- * FIXME: this might be a good starting point to create a "file peeker"? But,
- * its not otherwised used -- delete if not fixed/improved soon
- * XMLMalformedInputTests
- */
-
-public class XMLMalformedInputTests extends TestCase {
- private int READ_BUFFER_SIZE = 8000;
- private boolean DEBUG = false;
-
-
- public XMLMalformedInputTests(String name) {
- super(name);
- }
-
- /**
- * Tests for a file, filename that should throw a
- * MalformedInputExceptionWithDetail at character, expectedPosition. This
- * happens when no encoding is specified, so the default is used, but
- * there are characters that the default encoding does not recognize
- */
- void doTestMalformedInput(String filename, IResourceCharsetDetector detector, int expectedPosition) throws IOException {
- Exception foundException = null;
- int badCharPosition = -1;
- File file = TestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- InputStream istream = getMarkSupportedStream(inputStream);
- detector.set(istream);
- // IEncodedDocument doc =
- // detector.createNewStructuredDocument(filename, istream);
- EncodingMemento encodingMemento = ((XMLResourceEncodingDetector) detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
-
- Charset charset = Charset.forName(foundIANAEncoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- istream.close();
- inputStream.close();
-
- // now, try reading as per encoding
- inputStream = new FileInputStream(file);
- // skip BOM for this case
- // System.out.println(inputStream.read());
- // System.out.println(inputStream.read());
- // System.out.println(inputStream.read());
- InputStreamReader reader = new InputStreamReader(inputStream, charsetDecoder);
-
- try {
- // just try reading ... should throw exception
- // exception)
- readInputStream(reader);
- }
- catch (MalformedInputException e) {
- // as expected, now do detailed checking.
- inputStream.close();
- istream.close();
- inputStream = new FileInputStream(file);
- charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
- reader = new InputStreamReader(inputStream, charsetDecoder);
- istream = getMarkSupportedStream(inputStream);
- try {
- handleMalFormedInput_DetailChecking(reader, foundIANAEncoding);
- }
- catch (MalformedInputExceptionWithDetail se) {
- foundException = se;
- badCharPosition = se.getCharPosition();
- }
-
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
-
- }
- // handle adjustments here for VM differnces:
- // for now its either 49 or 49 + 2 BOMs (51)
- // can be smarting later.
- assertTrue("MalformedInputException was not thrown as expected for filename: " + filename + " Exception thrown:" + foundException, foundException instanceof MalformedInputExceptionWithDetail);
- assertTrue("Wrong character position detected in MalformedInputException. Expected: " + expectedPosition + " Found: " + badCharPosition, (badCharPosition == expectedPosition) || badCharPosition == expectedPosition - 2);
- }
-
- // public void testXSLMalformedInput() throws IOException {
- // String filename = fileLocation + "MalformedNoEncoding.xsl";
- // doTestMalformedInput(filename, new XMLResourceEncodingDetector(), 211);
- // }
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- if (DEBUG) {
- System.out.println(tBuff[0]);
- }
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- /*
- * removed for PPC machine with IBM VM
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=126503
- */
- // public void testXMLMalformedInput() throws IOException {
- // String filename = fileLocation + "MalformedNoEncoding.xml";
- // doTestMalformedInput(filename, new XMLResourceEncodingDetector(), 51);
- // }
- // since above test was only one im this class, put in this no op to avoid
- // a failure due to no tests in class!
- public void testNoOp() {
- assertTrue(true);
- }
-
- private void handleMalFormedInput_DetailChecking(Reader reader, String encodingName) throws IOException, MalformedInputExceptionWithDetail {
- int charPostion = -1;
- charPostion = getCharPostionOfFailure(reader);
- // all of that just to throw more accurate error
- // note: we do the conversion to ianaName, instead of using the local
- // variable,
- // because this is ultimately only for the user error message (that
- // is,
- // the error occurred
- // in context of javaEncodingName no matter what ianaEncodingName is
- throw new MalformedInputExceptionWithDetail(encodingName, charPostion);
- }
-
- private int getCharPostionOfFailure(Reader reader) throws IOException {
- int charPosition = 1;
- int charRead = -1;
- int result = -1;
- boolean errorFound = false;
- do {
- try {
- if (reader.ready()) {
- charRead = reader.read();
- }
- if (DEBUG) {
- System.out.println(charPosition + ": " + escape((char) charRead, true));
- }
- charPosition++;
- }
- catch (MalformedInputException e) {
- // this is expected, since we're expecting failure,
- // so no need to do anything.
- errorFound = true;
- break;
- }
- }
- while ((charRead != -1 && !errorFound) && reader.ready());
-
- if (errorFound)
- result = charPosition;
- else
- result = -1;
- return result;
- }
-
- private String escape(char aChar, boolean escapeSpace) {
-
- StringBuffer outBuffer = new StringBuffer();
- switch (aChar) {
- case ' ' :
- if (escapeSpace)
- outBuffer.append('\\');
-
- outBuffer.append(' ');
- break;
- case '\\' :
- outBuffer.append('\\');
- outBuffer.append('\\');
- break;
- case '\t' :
- outBuffer.append('\\');
- outBuffer.append('t');
- break;
- case '\n' :
- outBuffer.append('\\');
- outBuffer.append('n');
- break;
- case '\r' :
- outBuffer.append('\\');
- outBuffer.append('r');
- break;
- case '\f' :
- outBuffer.append('\\');
- outBuffer.append('f');
- break;
- default :
- if ((aChar < 0x0020) || (aChar > 0x007e)) {
- outBuffer.append('\\');
- outBuffer.append('u');
- outBuffer.append(toHex((aChar >> 12) & 0xF));
- outBuffer.append(toHex((aChar >> 8) & 0xF));
- outBuffer.append(toHex((aChar >> 4) & 0xF));
- outBuffer.append(toHex(aChar & 0xF));
- }
- else {
- if (specialSaveChars.indexOf(aChar) != -1)
- outBuffer.append('\\');
- outBuffer.append(aChar);
- }
- }
-
- return outBuffer.toString();
- }
-
- /**
- * Convert a nibble to a hex character
- *
- * @param nibble
- * the nibble to convert.
- */
- private static char toHex(int nibble) {
- return hexDigit[(nibble & 0xF)];
- }
-
- /** A table of hex digits */
- private static final char[] hexDigit = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
- private static final String specialSaveChars = "=: \t\r\n\f#!";
-
-}
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/test.xml b/tests/org.eclipse.wst.xml.tests.encoding/test.xml
deleted file mode 100644
index 0769819..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.tests.encoding.EncodingTestSuite" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles.zip b/tests/org.eclipse.wst.xml.tests.encoding/testfiles.zip
deleted file mode 100644
index 234c401..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm
deleted file mode 100644
index 35570fe..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%-- jsf:codeBehind language="java" location="/JavaSource/pagecode/test/Kaeru5.java" --%><%-- /jsf:codeBehind --%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@taglib uri="http://www.ibm.com/jsf/html_extended" prefix="hx"%>
-<HTML>
-<HEAD>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ page
-language="java"
-contentType="text/html; charset=SHIFT_JIS"
-pageEncoding="SHIFT_JIS"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=SHIFT_JIS">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<LINK rel="stylesheet" type="text/css" href="../theme/stylesheet.css"
- title="Style">
-<TITLE>kaeru.jsp</TITLE>
-</HEAD>
-<f:view>
- <BODY>
- <hx:scriptCollector id="scriptCollector1">
- <h:form styleClass="form" id="form1">
- ³F
- ³F
- ³F
- <h:selectOneMenu id="Combo30" styleClass="Combo30" tabindex="26">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="Øæø" itemLabel="Øæø" />
- </h:selectOneMenu>
- <h:selectOneMenu id="Combo31" styleClass="Combo31" tabindex="27">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="kyoto" itemLabel="kyoto" />
- </h:selectOneMenu>
- </h:form>
- </hx:scriptCollector>
- </BODY>
-</f:view>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp
deleted file mode 100644
index 083704b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%-- jsf:codeBehind language="java" location="/JavaSource/pagecode/test/Kaeru5.java" --%><%-- /jsf:codeBehind --%>
-<%@taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@taglib uri="http://www.ibm.com/jsf/html_extended" prefix="hx"%>
-<HTML>
-<HEAD>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ page
-language="java"
-contentType="text/html; charset=SHIFT_JIS"
-pageEncoding="SHIFT_JIS"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=SHIFT_JIS">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<LINK rel="stylesheet" type="text/css" href="../theme/stylesheet.css"
- title="Style">
-<TITLE>kaeru.jsp</TITLE>
-</HEAD>
-<f:view>
- <BODY>
- <hx:scriptCollector id="scriptCollector1">
- <h:form styleClass="form" id="form1">
- ³F
- ³F
- ³F
- <h:selectOneMenu id="Combo30" styleClass="Combo30" tabindex="26">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="Øæø" itemLabel="Øæø" />
- </h:selectOneMenu>
- <h:selectOneMenu id="Combo31" styleClass="Combo31" tabindex="27">
- <f:selectItem itemValue="tokyo" itemLabel="tokyo" />
- <f:selectItem itemValue="kyoto" itemLabel="kyoto" />
- </h:selectOneMenu>
- </h:form>
- </hx:scriptCollector>
- </BODY>
-</f:view>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css
deleted file mode 100644
index 1e256e7..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "EUC-JP";
-
-BODY {
- font-family : "£Í£Ó £Ð¥´¥·¥Ã¥¯";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css
deleted file mode 100644
index 384768b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-2022-JP";
-
-BODY {
- font-family : "$B#M#S(B $B#P%4%7%C%/(B";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css
deleted file mode 100644
index e529cda..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "SHIFT_JIS";
-
-BODY {
- font-family : "lr oSVbN";
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css
deleted file mode 100644
index f3f06bc..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css
+++ /dev/null
@@ -1,46 +0,0 @@
-BODY {
- font-family: "Times New Roman", "MS Sans Serif";
- text-decoration: none;
- background-color: white;
-}
-
-TD {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- text-align: left;
-}
-
-TH {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: left;
-}
-
-H1 {
- font-family: "Times New Roman";
- font-size: 14pt;
- color: black;
- font-style: normal;
- font-weight: bolder;
- text-align: center
-}
-
-H2 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: normal;
- font-weight: bolder
-}
-
-H3 {
- font-family: "Times New Roman";
- font-size: 12pt;
- color: black;
- font-style: italic
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css
deleted file mode 100644
index dc997eb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css
deleted file mode 100644
index f1a4e44..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6;
-
-
-
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css
deleted file mode 100644
index 53c8a1f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- @charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.css
deleted file mode 100644
index 5c151d9..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16BOM.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.css
deleted file mode 100644
index f8c05d5..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16be.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.css
deleted file mode 100644
index d8527c1..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16beMalformed.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.css
deleted file mode 100644
index 6c94ffb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16le.css
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.css b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.css
deleted file mode 100644
index c7dd678..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/utf16leMalformed.css
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Big5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Big5.xml"
deleted file mode 100644
index 3dfe5a5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Big5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-CESU-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-CESU-8.xml"
deleted file mode 100644
index fb7a544..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-CESU-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="CESU-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-COMPOUND_TEXT.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-COMPOUND_TEXT.xml"
deleted file mode 100644
index 30fb712..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-COMPOUND_TEXT.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="COMPOUND_TEXT"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-CN.xml"
deleted file mode 100644
index c50b16b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-JP.xml"
deleted file mode 100644
index 1539774..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-KR.xml"
deleted file mode 100644
index 5ae929b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-EUC-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB18030.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB18030.xml"
deleted file mode 100644
index 3fa13c0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB18030.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB18030"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB2312.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB2312.xml"
deleted file mode 100644
index 98492d7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GB2312.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB2312"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GBK.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GBK.xml"
deleted file mode 100644
index 92bbd47..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-GBK.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GBK"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1006.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1006.xml"
deleted file mode 100644
index 777ba75..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1006.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1006"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1041.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1041.xml"
deleted file mode 100644
index c4958e9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1041.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1041"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1043.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1043.xml"
deleted file mode 100644
index 573d3aa..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1043.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1043"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046.xml"
deleted file mode 100644
index 6c40c19..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1046"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046S.xml"
deleted file mode 100644
index 3de20a4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1046S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1046S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1088.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1088.xml"
deleted file mode 100644
index 07a51a3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1088.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1088"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1098.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1098.xml"
deleted file mode 100644
index cda3443..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1098.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1098"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1114.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1114.xml"
deleted file mode 100644
index d33cef4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1114.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1114"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1115.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1115.xml"
deleted file mode 100644
index b0290b1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1115.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1115"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1124.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1124.xml"
deleted file mode 100644
index 05596c5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1124.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1124"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363.xml"
deleted file mode 100644
index af72a5d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1363"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363C.xml"
deleted file mode 100644
index f18124d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1363C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1363C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1370.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1370.xml"
deleted file mode 100644
index 1839c89..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1370.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1370"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1381.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1381.xml"
deleted file mode 100644
index 9ac90e9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1381.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1381"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1383.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1383.xml"
deleted file mode 100644
index a9af28a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1383.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1383"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1386.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1386.xml"
deleted file mode 100644
index dad99ce..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-1386.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-1386"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-33722C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-33722C.xml"
deleted file mode 100644
index 1f592eb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-33722C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-33722C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-437.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-437.xml"
deleted file mode 100644
index 5f04ef0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-437.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-437"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-737.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-737.xml"
deleted file mode 100644
index bb8535f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-737.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-737"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-775.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-775.xml"
deleted file mode 100644
index adc9449..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-775.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-775"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-808.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-808.xml"
deleted file mode 100644
index 8028fce..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-808.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-808"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-850.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-850.xml"
deleted file mode 100644
index 6187d91..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-850.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-850"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-852.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-852.xml"
deleted file mode 100644
index c194d5c..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-852.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-852"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-855.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-855.xml"
deleted file mode 100644
index d03547c..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-855.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-855"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-856.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-856.xml"
deleted file mode 100644
index 54a4b5b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-856.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-856"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-857.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-857.xml"
deleted file mode 100644
index ae20c91..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-857.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-857"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-858.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-858.xml"
deleted file mode 100644
index 355f14a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-858.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-858"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-859.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-859.xml"
deleted file mode 100644
index e59b250..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-859.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-859"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-860.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-860.xml"
deleted file mode 100644
index ab82293..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-860.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-860"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-861.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-861.xml"
deleted file mode 100644
index 82910ec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-861.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-861"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-862.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-862.xml"
deleted file mode 100644
index 52a7114..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-862.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-862"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-863.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-863.xml"
deleted file mode 100644
index d167357..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-863.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-863"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864.xml"
deleted file mode 100644
index 433e577..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-864"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864S.xml"
deleted file mode 100644
index e83aeb8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-864S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-864S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-865.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-865.xml"
deleted file mode 100644
index dd7d5db..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-865.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-865"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-866.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-866.xml"
deleted file mode 100644
index b1fa261..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-866.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-866"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-867.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-867.xml"
deleted file mode 100644
index 35f6750..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-867.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-867"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-868.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-868.xml"
deleted file mode 100644
index 6c3801a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-868.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-868"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-869.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-869.xml"
deleted file mode 100644
index 7fee0c1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-869.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-869"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-874.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-874.xml"
deleted file mode 100644
index 37c250a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-874.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-874"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-897.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-897.xml"
deleted file mode 100644
index f1b1596..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-897.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-897"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-921.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-921.xml"
deleted file mode 100644
index 28417e0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-921.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-921"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-922.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-922.xml"
deleted file mode 100644
index 606b826..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-922.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-922"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-932.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-932.xml"
deleted file mode 100644
index 7946fe0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-932.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-932"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942.xml"
deleted file mode 100644
index 833e5bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-942"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942C.xml"
deleted file mode 100644
index a23e38d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-942C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-942C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943.xml"
deleted file mode 100644
index b414260..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-943"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943C.xml"
deleted file mode 100644
index dda91ea..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-943C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-943C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-948.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-948.xml"
deleted file mode 100644
index beda222..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-948.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-948"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949.xml"
deleted file mode 100644
index 2c5acdb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949C.xml"
deleted file mode 100644
index 06f45c6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-949C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-949C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-950.xml"
deleted file mode 100644
index 0f566b1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-954C.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-954C.xml"
deleted file mode 100644
index 9a65c14..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-IBM-954C.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="IBM-954C"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN-GB.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN-GB.xml"
deleted file mode 100644
index 556b59a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN-GB.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-CN-GB"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN.xml"
deleted file mode 100644
index ecf3da3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-JP.xml"
deleted file mode 100644
index ac67c17..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-KR.xml"
deleted file mode 100644
index 327804a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-2022-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-1.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-1.xml"
deleted file mode 100644
index af0ab83..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-1.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-10.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-10.xml"
deleted file mode 100644
index 5f07496..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-10.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-10"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-13.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-13.xml"
deleted file mode 100644
index 3f3ed61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-13.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-13"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-14.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-14.xml"
deleted file mode 100644
index 33899cb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-14.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-14"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-15.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-15.xml"
deleted file mode 100644
index 98d6fd7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-15.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-16.xml"
deleted file mode 100644
index 10f57d8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-16.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-16"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-2.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-2.xml"
deleted file mode 100644
index 58185c2..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-2.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-3.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-3.xml"
deleted file mode 100644
index 8134941..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-3.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-3"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-4.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-4.xml"
deleted file mode 100644
index d0f9935..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-4.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-4"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-5.xml"
deleted file mode 100644
index 7686bf9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6.xml"
deleted file mode 100644
index 23444bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6S.xml"
deleted file mode 100644
index 5d9ad9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-6S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-7.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-7.xml"
deleted file mode 100644
index fee95d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-7.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-7"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-8.xml"
deleted file mode 100644
index f64d301..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-9.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-9.xml"
deleted file mode 100644
index 0083930..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-ISO-8859-9.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0201.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0201.xml"
deleted file mode 100644
index 35233d9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0201.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS0201"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0208.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0208.xml"
deleted file mode 100644
index 2d9934b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0208.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS0208"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0212.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0212.xml"
deleted file mode 100644
index d029f63..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-JIS0212.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS0212"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Johab.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Johab.xml"
deleted file mode 100644
index 1e07ccb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Johab.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Johab"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-R.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-R.xml"
deleted file mode 100644
index 23045e6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-R.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-RU.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-RU.xml"
deleted file mode 100644
index 47cdda0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-RU.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-RU"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-U.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-U.xml"
deleted file mode 100644
index 2548f3c..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KOI8-U.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-U"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KSC5601.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KSC5601.xml"
deleted file mode 100644
index 0859479..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-KSC5601.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KSC5601"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacArabic.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacArabic.xml"
deleted file mode 100644
index 2fe027a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacArabic.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacArabic"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCentralEurope.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCentralEurope.xml"
deleted file mode 100644
index 1bb0d70..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCentralEurope.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacCentralEurope"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCroatian.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCroatian.xml"
deleted file mode 100644
index d50ab3a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCroatian.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacCroatian"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCyrillic.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCyrillic.xml"
deleted file mode 100644
index 00e3c92..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacCyrillic.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacCyrillic"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacGreek.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacGreek.xml"
deleted file mode 100644
index edfad62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacGreek.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacGreek"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacHebrew.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacHebrew.xml"
deleted file mode 100644
index 93b5492..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacHebrew.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacHebrew"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacIceland.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacIceland.xml"
deleted file mode 100644
index 5dad47d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacIceland.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacIceland"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRoman.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRoman.xml"
deleted file mode 100644
index bc1f0d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRoman.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacRoman"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRomania.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRomania.xml"
deleted file mode 100644
index 9f6a4b9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacRomania.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacRomania"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacThai.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacThai.xml"
deleted file mode 100644
index 4f4dacf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacThai.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacThai"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacTurkish.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacTurkish.xml"
deleted file mode 100644
index 1cd6826..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacTurkish.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacTurkish"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacUkraine.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacUkraine.xml"
deleted file mode 100644
index d0bc953..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-MacUkraine.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="MacUkraine"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-PTCP154.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-PTCP154.xml"
deleted file mode 100644
index 0e767ba..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-PTCP154.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="PTCP154"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Shift_JIS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Shift_JIS.xml"
deleted file mode 100644
index 69b4e62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-Shift_JIS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-TIS-620.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-TIS-620.xml"
deleted file mode 100644
index ffd32a7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-TIS-620.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="TIS-620"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-US-ASCII.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-US-ASCII.xml"
deleted file mode 100644
index 87ea8b0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-US-ASCII.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16.xml"
deleted file mode 100644
index 169dc52..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16BE.xml"
deleted file mode 100644
index 4358c0b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16LE.xml"
deleted file mode 100644
index e8d2e0d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-16LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32.xml"
deleted file mode 100644
index 410d508..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32BE.xml"
deleted file mode 100644
index 28a9bf1..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32LE.xml"
deleted file mode 100644
index e90a7f8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-32LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8.xml"
deleted file mode 100644
index a26f3bb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8J.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8J.xml"
deleted file mode 100644
index 146659d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-UTF-8J.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8J"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeBig.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeBig.xml"
deleted file mode 100644
index 851b70a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeBig.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeLittle.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeLittle.xml"
deleted file mode 100644
index 714b9bc..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-X-UnicodeLittle.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-hp-roman8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-hp-roman8.xml"
deleted file mode 100644
index 0e98304..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-hp-roman8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="hp-roman8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1250.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1250.xml"
deleted file mode 100644
index 68d656f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1250.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1251.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1251.xml"
deleted file mode 100644
index d2bc0c3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1251.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1252.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1252.xml"
deleted file mode 100644
index d8ac585..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1252.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1253.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1253.xml"
deleted file mode 100644
index 59e6aec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1253.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1254.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1254.xml"
deleted file mode 100644
index f80628f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1254.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1254"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1255.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1255.xml"
deleted file mode 100644
index 7267270..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1255.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1255"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256.xml"
deleted file mode 100644
index d5e0049..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256S.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256S.xml"
deleted file mode 100644
index 7987264..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1256S.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256S"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1257.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1257.xml"
deleted file mode 100644
index b095a61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1257.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1258.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1258.xml"
deleted file mode 100644
index 4fc5e9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-1258.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1258"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-874.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-874.xml"
deleted file mode 100644
index 82c3d13..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-874.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-874"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-932.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-932.xml"
deleted file mode 100644
index b7f26b5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-932.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-932"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-936.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-936.xml"
deleted file mode 100644
index 0879fce..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-936.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-936"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-949.xml"
deleted file mode 100644
index f2d3481..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-950.xml"
deleted file mode 100644
index 57c3bc6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/test-windows-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/testMethods.text" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/testMethods.text"
deleted file mode 100644
index 774dddb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 \0501.4.2\051/xml/testMethods.text"
+++ /dev/null
@@ -1,525 +0,0 @@
-131
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
- public void testFile1() throws CoreException, IOException {
- String charsetName = "CESU-8";
- doGenTest(charsetName);
- }
- public void testFile2() throws CoreException, IOException {
- String charsetName = "COMPOUND_TEXT";
- doGenTest(charsetName);
- }
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-CN";
- doGenTest(charsetName);
- }
- public void testFile4() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
- public void testFile5() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
- public void testFile6() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
- public void testFile7() throws CoreException, IOException {
- String charsetName = "GB2312";
- doGenTest(charsetName);
- }
- public void testFile8() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
- public void testFile9() throws CoreException, IOException {
- String charsetName = "hp-roman8";
- doGenTest(charsetName);
- }
- public void testFile10() throws CoreException, IOException {
- String charsetName = "IBM-1006";
- doGenTest(charsetName);
- }
- public void testFile11() throws CoreException, IOException {
- String charsetName = "IBM-1041";
- doGenTest(charsetName);
- }
- public void testFile12() throws CoreException, IOException {
- String charsetName = "IBM-1043";
- doGenTest(charsetName);
- }
- public void testFile13() throws CoreException, IOException {
- String charsetName = "IBM-1046";
- doGenTest(charsetName);
- }
- public void testFile14() throws CoreException, IOException {
- String charsetName = "IBM-1046S";
- doGenTest(charsetName);
- }
- public void testFile15() throws CoreException, IOException {
- String charsetName = "IBM-1088";
- doGenTest(charsetName);
- }
- public void testFile16() throws CoreException, IOException {
- String charsetName = "IBM-1098";
- doGenTest(charsetName);
- }
- public void testFile17() throws CoreException, IOException {
- String charsetName = "IBM-1114";
- doGenTest(charsetName);
- }
- public void testFile18() throws CoreException, IOException {
- String charsetName = "IBM-1115";
- doGenTest(charsetName);
- }
- public void testFile19() throws CoreException, IOException {
- String charsetName = "IBM-1124";
- doGenTest(charsetName);
- }
- public void testFile20() throws CoreException, IOException {
- String charsetName = "IBM-1363";
- doGenTest(charsetName);
- }
- public void testFile21() throws CoreException, IOException {
- String charsetName = "IBM-1363C";
- doGenTest(charsetName);
- }
- public void testFile22() throws CoreException, IOException {
- String charsetName = "IBM-1370";
- doGenTest(charsetName);
- }
- public void testFile23() throws CoreException, IOException {
- String charsetName = "IBM-1381";
- doGenTest(charsetName);
- }
- public void testFile24() throws CoreException, IOException {
- String charsetName = "IBM-1383";
- doGenTest(charsetName);
- }
- public void testFile25() throws CoreException, IOException {
- String charsetName = "IBM-1386";
- doGenTest(charsetName);
- }
- public void testFile26() throws CoreException, IOException {
- String charsetName = "IBM-33722C";
- doGenTest(charsetName);
- }
- public void testFile27() throws CoreException, IOException {
- String charsetName = "IBM-437";
- doGenTest(charsetName);
- }
- public void testFile28() throws CoreException, IOException {
- String charsetName = "IBM-737";
- doGenTest(charsetName);
- }
- public void testFile29() throws CoreException, IOException {
- String charsetName = "IBM-775";
- doGenTest(charsetName);
- }
- public void testFile30() throws CoreException, IOException {
- String charsetName = "IBM-808";
- doGenTest(charsetName);
- }
- public void testFile31() throws CoreException, IOException {
- String charsetName = "IBM-850";
- doGenTest(charsetName);
- }
- public void testFile32() throws CoreException, IOException {
- String charsetName = "IBM-852";
- doGenTest(charsetName);
- }
- public void testFile33() throws CoreException, IOException {
- String charsetName = "IBM-855";
- doGenTest(charsetName);
- }
- public void testFile34() throws CoreException, IOException {
- String charsetName = "IBM-856";
- doGenTest(charsetName);
- }
- public void testFile35() throws CoreException, IOException {
- String charsetName = "IBM-857";
- doGenTest(charsetName);
- }
- public void testFile36() throws CoreException, IOException {
- String charsetName = "IBM-858";
- doGenTest(charsetName);
- }
- public void testFile37() throws CoreException, IOException {
- String charsetName = "IBM-859";
- doGenTest(charsetName);
- }
- public void testFile38() throws CoreException, IOException {
- String charsetName = "IBM-860";
- doGenTest(charsetName);
- }
- public void testFile39() throws CoreException, IOException {
- String charsetName = "IBM-861";
- doGenTest(charsetName);
- }
- public void testFile40() throws CoreException, IOException {
- String charsetName = "IBM-862";
- doGenTest(charsetName);
- }
- public void testFile41() throws CoreException, IOException {
- String charsetName = "IBM-863";
- doGenTest(charsetName);
- }
- public void testFile42() throws CoreException, IOException {
- String charsetName = "IBM-864";
- doGenTest(charsetName);
- }
- public void testFile43() throws CoreException, IOException {
- String charsetName = "IBM-864S";
- doGenTest(charsetName);
- }
- public void testFile44() throws CoreException, IOException {
- String charsetName = "IBM-865";
- doGenTest(charsetName);
- }
- public void testFile45() throws CoreException, IOException {
- String charsetName = "IBM-866";
- doGenTest(charsetName);
- }
- public void testFile46() throws CoreException, IOException {
- String charsetName = "IBM-867";
- doGenTest(charsetName);
- }
- public void testFile47() throws CoreException, IOException {
- String charsetName = "IBM-868";
- doGenTest(charsetName);
- }
- public void testFile48() throws CoreException, IOException {
- String charsetName = "IBM-869";
- doGenTest(charsetName);
- }
- public void testFile49() throws CoreException, IOException {
- String charsetName = "IBM-874";
- doGenTest(charsetName);
- }
- public void testFile50() throws CoreException, IOException {
- String charsetName = "IBM-897";
- doGenTest(charsetName);
- }
- public void testFile51() throws CoreException, IOException {
- String charsetName = "IBM-921";
- doGenTest(charsetName);
- }
- public void testFile52() throws CoreException, IOException {
- String charsetName = "IBM-922";
- doGenTest(charsetName);
- }
- public void testFile53() throws CoreException, IOException {
- String charsetName = "IBM-932";
- doGenTest(charsetName);
- }
- public void testFile54() throws CoreException, IOException {
- String charsetName = "IBM-942";
- doGenTest(charsetName);
- }
- public void testFile55() throws CoreException, IOException {
- String charsetName = "IBM-942C";
- doGenTest(charsetName);
- }
- public void testFile56() throws CoreException, IOException {
- String charsetName = "IBM-943";
- doGenTest(charsetName);
- }
- public void testFile57() throws CoreException, IOException {
- String charsetName = "IBM-943C";
- doGenTest(charsetName);
- }
- public void testFile58() throws CoreException, IOException {
- String charsetName = "IBM-948";
- doGenTest(charsetName);
- }
- public void testFile59() throws CoreException, IOException {
- String charsetName = "IBM-949";
- doGenTest(charsetName);
- }
- public void testFile60() throws CoreException, IOException {
- String charsetName = "IBM-949C";
- doGenTest(charsetName);
- }
- public void testFile61() throws CoreException, IOException {
- String charsetName = "IBM-950";
- doGenTest(charsetName);
- }
- public void testFile62() throws CoreException, IOException {
- String charsetName = "IBM-954C";
- doGenTest(charsetName);
- }
- public void testFile63() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN";
- doGenTest(charsetName);
- }
- public void testFile64() throws CoreException, IOException {
- String charsetName = "ISO-2022-CN-GB";
- doGenTest(charsetName);
- }
- public void testFile65() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
- public void testFile66() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
- public void testFile67() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
- public void testFile68() throws CoreException, IOException {
- String charsetName = "ISO-8859-10";
- doGenTest(charsetName);
- }
- public void testFile69() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
- public void testFile70() throws CoreException, IOException {
- String charsetName = "ISO-8859-14";
- doGenTest(charsetName);
- }
- public void testFile71() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
- public void testFile72() throws CoreException, IOException {
- String charsetName = "ISO-8859-16";
- doGenTest(charsetName);
- }
- public void testFile73() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
- public void testFile74() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
- public void testFile75() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
- public void testFile76() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
- public void testFile77() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
- public void testFile78() throws CoreException, IOException {
- String charsetName = "ISO-8859-6S";
- doGenTest(charsetName);
- }
- public void testFile79() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
- public void testFile80() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
- public void testFile81() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
- public void testFile82() throws CoreException, IOException {
- String charsetName = "JIS0201";
- doGenTest(charsetName);
- }
- public void testFile83() throws CoreException, IOException {
- String charsetName = "JIS0208";
- doGenTest(charsetName);
- }
- public void testFile84() throws CoreException, IOException {
- String charsetName = "JIS0212";
- doGenTest(charsetName);
- }
- public void testFile85() throws CoreException, IOException {
- String charsetName = "Johab";
- doGenTest(charsetName);
- }
- public void testFile86() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
- public void testFile87() throws CoreException, IOException {
- String charsetName = "KOI8-RU";
- doGenTest(charsetName);
- }
- public void testFile88() throws CoreException, IOException {
- String charsetName = "KOI8-U";
- doGenTest(charsetName);
- }
- public void testFile89() throws CoreException, IOException {
- String charsetName = "KSC5601";
- doGenTest(charsetName);
- }
- public void testFile90() throws CoreException, IOException {
- String charsetName = "MacArabic";
- doGenTest(charsetName);
- }
- public void testFile91() throws CoreException, IOException {
- String charsetName = "MacCentralEurope";
- doGenTest(charsetName);
- }
- public void testFile92() throws CoreException, IOException {
- String charsetName = "MacCroatian";
- doGenTest(charsetName);
- }
- public void testFile93() throws CoreException, IOException {
- String charsetName = "MacCyrillic";
- doGenTest(charsetName);
- }
- public void testFile94() throws CoreException, IOException {
- String charsetName = "MacGreek";
- doGenTest(charsetName);
- }
- public void testFile95() throws CoreException, IOException {
- String charsetName = "MacHebrew";
- doGenTest(charsetName);
- }
- public void testFile96() throws CoreException, IOException {
- String charsetName = "MacIceland";
- doGenTest(charsetName);
- }
- public void testFile97() throws CoreException, IOException {
- String charsetName = "MacRoman";
- doGenTest(charsetName);
- }
- public void testFile98() throws CoreException, IOException {
- String charsetName = "MacRomania";
- doGenTest(charsetName);
- }
- public void testFile99() throws CoreException, IOException {
- String charsetName = "MacThai";
- doGenTest(charsetName);
- }
- public void testFile100() throws CoreException, IOException {
- String charsetName = "MacTurkish";
- doGenTest(charsetName);
- }
- public void testFile101() throws CoreException, IOException {
- String charsetName = "MacUkraine";
- doGenTest(charsetName);
- }
- public void testFile102() throws CoreException, IOException {
- String charsetName = "PTCP154";
- doGenTest(charsetName);
- }
- public void testFile103() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
- public void testFile104() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
- public void testFile105() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
- public void testFile106() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
- public void testFile107() throws CoreException, IOException {
- String charsetName = "UTF-16BE";
- doGenTest(charsetName);
- }
- public void testFile108() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
- public void testFile109() throws CoreException, IOException {
- String charsetName = "UTF-32";
- doGenTest(charsetName);
- }
- public void testFile110() throws CoreException, IOException {
- String charsetName = "UTF-32BE";
- doGenTest(charsetName);
- }
- public void testFile111() throws CoreException, IOException {
- String charsetName = "UTF-32LE";
- doGenTest(charsetName);
- }
- public void testFile112() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
- public void testFile113() throws CoreException, IOException {
- String charsetName = "UTF-8J";
- doGenTest(charsetName);
- }
- public void testFile114() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
- public void testFile115() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
- public void testFile116() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
- public void testFile117() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
- public void testFile118() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
- public void testFile119() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
- public void testFile120() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
- public void testFile121() throws CoreException, IOException {
- String charsetName = "windows-1256S";
- doGenTest(charsetName);
- }
- public void testFile122() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
- public void testFile123() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
- public void testFile124() throws CoreException, IOException {
- String charsetName = "windows-874";
- doGenTest(charsetName);
- }
- public void testFile125() throws CoreException, IOException {
- String charsetName = "windows-932";
- doGenTest(charsetName);
- }
- public void testFile126() throws CoreException, IOException {
- String charsetName = "windows-936";
- doGenTest(charsetName);
- }
- public void testFile127() throws CoreException, IOException {
- String charsetName = "windows-949";
- doGenTest(charsetName);
- }
- public void testFile128() throws CoreException, IOException {
- String charsetName = "windows-950";
- doGenTest(charsetName);
- }
- public void testFile129() throws CoreException, IOException {
- String charsetName = "X-UnicodeBig";
- doGenTest(charsetName);
- }
- public void testFile130() throws CoreException, IOException {
- String charsetName = "X-UnicodeLittle";
- doGenTest(charsetName);
- }
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5-HKSCS.xml"
deleted file mode 100644
index 910324d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5.xml"
deleted file mode 100644
index 3dfe5a5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Big5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-JP.xml"
deleted file mode 100644
index 1539774..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-KR.xml"
deleted file mode 100644
index 5ae929b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-EUC-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GB18030.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GB18030.xml"
deleted file mode 100644
index 3fa13c0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GB18030.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB18030"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GBK.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GBK.xml"
deleted file mode 100644
index 92bbd47..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-GBK.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GBK"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-JP.xml"
deleted file mode 100644
index ac67c17..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-KR.xml"
deleted file mode 100644
index 327804a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-2022-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-1.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-1.xml"
deleted file mode 100644
index af0ab83..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-1.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-13.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-13.xml"
deleted file mode 100644
index 3f3ed61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-13.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-13"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-15.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-15.xml"
deleted file mode 100644
index 98d6fd7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-15.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-2.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-2.xml"
deleted file mode 100644
index 58185c2..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-2.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-3.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-3.xml"
deleted file mode 100644
index 8134941..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-3.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-3"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-4.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-4.xml"
deleted file mode 100644
index d0f9935..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-4.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-4"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-5.xml"
deleted file mode 100644
index 7686bf9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-6.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-6.xml"
deleted file mode 100644
index 23444bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-6.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-7.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-7.xml"
deleted file mode 100644
index fee95d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-7.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-7"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-8.xml"
deleted file mode 100644
index f64d301..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-9.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-9.xml"
deleted file mode 100644
index 0083930..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-ISO-8859-9.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0201.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0201.xml"
deleted file mode 100644
index b3a42d8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0201.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0201"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0212-1990.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0212-1990.xml"
deleted file mode 100644
index 0f70b74..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-JIS_X0212-1990.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0212-1990"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-KOI8-R.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-KOI8-R.xml"
deleted file mode 100644
index 23045e6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-KOI8-R.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Shift_JIS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Shift_JIS.xml"
deleted file mode 100644
index 69b4e62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-Shift_JIS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-TIS-620.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-TIS-620.xml"
deleted file mode 100644
index ffd32a7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-TIS-620.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="TIS-620"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-US-ASCII.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-US-ASCII.xml"
deleted file mode 100644
index 87ea8b0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-US-ASCII.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16.xml"
deleted file mode 100644
index fec5530..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16BE.xml"
deleted file mode 100644
index 4358c0b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16LE.xml"
deleted file mode 100644
index e8d2e0d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-16LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-8.xml"
deleted file mode 100644
index a26f3bb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-UTF-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1250.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1250.xml"
deleted file mode 100644
index 68d656f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1250.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1251.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1251.xml"
deleted file mode 100644
index d2bc0c3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1251.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1252.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1252.xml"
deleted file mode 100644
index d8ac585..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1252.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1253.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1253.xml"
deleted file mode 100644
index 59e6aec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1253.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1254.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1254.xml"
deleted file mode 100644
index f80628f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1254.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1254"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1255.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1255.xml"
deleted file mode 100644
index 7267270..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1255.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1255"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1256.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1256.xml"
deleted file mode 100644
index d5e0049..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1256.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1257.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1257.xml"
deleted file mode 100644
index b095a61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1257.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1258.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1258.xml"
deleted file mode 100644
index 4fc5e9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-1258.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1258"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-31j.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-31j.xml"
deleted file mode 100644
index 938cfd5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-windows-31j.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-31j"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-CN.xml"
deleted file mode 100644
index 3fdc641..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-TW.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-TW.xml"
deleted file mode 100644
index 348e37a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-EUC-TW.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-TW"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-JIS0208.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-JIS0208.xml"
deleted file mode 100644
index 62d07fd..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-JIS0208.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-JIS0208"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-Johab.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-Johab.xml"
deleted file mode 100644
index deaf87a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-Johab.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-Johab"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-MS950-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-MS950-HKSCS.xml"
deleted file mode 100644
index 5806b31..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-MS950-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-MS950-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-euc-jp-linux.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-euc-jp-linux.xml"
deleted file mode 100644
index 0b43dfb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-euc-jp-linux.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-euc-jp-linux"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-mswin-936.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-mswin-936.xml"
deleted file mode 100644
index e1bf10a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-mswin-936.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-mswin-936"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-949.xml"
deleted file mode 100644
index a8c93f4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-950.xml"
deleted file mode 100644
index 548e53b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/test-x-windows-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/testMethods.text" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/testMethods.text"
deleted file mode 100644
index 6f68f24..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 \0501.4.2_03-b02\051/xml/testMethods.text"
+++ /dev/null
@@ -1,193 +0,0 @@
-48
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
- public void testFile1() throws CoreException, IOException {
- String charsetName = "Big5-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile2() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
- public void testFile4() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
- public void testFile5() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
- public void testFile6() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
- public void testFile7() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
- public void testFile8() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
- public void testFile9() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
- public void testFile10() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
- public void testFile11() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
- public void testFile12() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
- public void testFile13() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
- public void testFile14() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
- public void testFile15() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
- public void testFile16() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
- public void testFile17() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
- public void testFile18() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
- public void testFile19() throws CoreException, IOException {
- String charsetName = "JIS_X0201";
- doGenTest(charsetName);
- }
- public void testFile20() throws CoreException, IOException {
- String charsetName = "JIS_X0212-1990";
- doGenTest(charsetName);
- }
- public void testFile21() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
- public void testFile22() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
- public void testFile23() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
- public void testFile24() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
- public void testFile25() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
- public void testFile26() throws CoreException, IOException {
- String charsetName = "UTF-16BE";
- doGenTest(charsetName);
- }
- public void testFile27() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
- public void testFile28() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
- public void testFile29() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
- public void testFile30() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
- public void testFile31() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
- public void testFile32() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
- public void testFile33() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
- public void testFile34() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
- public void testFile35() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
- public void testFile36() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
- public void testFile37() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
- public void testFile38() throws CoreException, IOException {
- String charsetName = "windows-31j";
- doGenTest(charsetName);
- }
- public void testFile39() throws CoreException, IOException {
- String charsetName = "x-EUC-CN";
- doGenTest(charsetName);
- }
- public void testFile40() throws CoreException, IOException {
- String charsetName = "x-euc-jp-linux";
- doGenTest(charsetName);
- }
- public void testFile41() throws CoreException, IOException {
- String charsetName = "x-EUC-TW";
- doGenTest(charsetName);
- }
- public void testFile42() throws CoreException, IOException {
- String charsetName = "x-JIS0208";
- doGenTest(charsetName);
- }
- public void testFile43() throws CoreException, IOException {
- String charsetName = "x-Johab";
- doGenTest(charsetName);
- }
- public void testFile44() throws CoreException, IOException {
- String charsetName = "x-MS950-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile45() throws CoreException, IOException {
- String charsetName = "x-mswin-936";
- doGenTest(charsetName);
- }
- public void testFile46() throws CoreException, IOException {
- String charsetName = "x-windows-949";
- doGenTest(charsetName);
- }
- public void testFile47() throws CoreException, IOException {
- String charsetName = "x-windows-950";
- doGenTest(charsetName);
- }
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5-HKSCS.xml"
deleted file mode 100644
index 910324d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5.xml"
deleted file mode 100644
index 3dfe5a5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Big5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Big5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-JP.xml"
deleted file mode 100644
index 1539774..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-KR.xml"
deleted file mode 100644
index 5ae929b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-EUC-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GB18030.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GB18030.xml"
deleted file mode 100644
index 3fa13c0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GB18030.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GB18030"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GBK.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GBK.xml"
deleted file mode 100644
index 92bbd47..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-GBK.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="GBK"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-JP.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-JP.xml"
deleted file mode 100644
index ac67c17..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-JP.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-JP"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-KR.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-KR.xml"
deleted file mode 100644
index 327804a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-2022-KR.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-2022-KR"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-1.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-1.xml"
deleted file mode 100644
index af0ab83..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-1.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-13.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-13.xml"
deleted file mode 100644
index 3f3ed61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-13.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-13"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-15.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-15.xml"
deleted file mode 100644
index 98d6fd7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-15.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-2.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-2.xml"
deleted file mode 100644
index 58185c2..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-2.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-2"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-3.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-3.xml"
deleted file mode 100644
index 8134941..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-3.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-3"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-4.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-4.xml"
deleted file mode 100644
index d0f9935..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-4.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-4"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-5.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-5.xml"
deleted file mode 100644
index 7686bf9..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-5.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-5"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-6.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-6.xml"
deleted file mode 100644
index 23444bf..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-6.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-6"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-7.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-7.xml"
deleted file mode 100644
index fee95d5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-7.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-7"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-8.xml"
deleted file mode 100644
index f64d301..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-9.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-9.xml"
deleted file mode 100644
index 0083930..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-ISO-8859-9.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-9"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0201.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0201.xml"
deleted file mode 100644
index b3a42d8..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0201.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0201"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0212-1990.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0212-1990.xml"
deleted file mode 100644
index 0f70b74..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-JIS_X0212-1990.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="JIS_X0212-1990"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-KOI8-R.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-KOI8-R.xml"
deleted file mode 100644
index 23045e6..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-KOI8-R.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Shift_JIS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Shift_JIS.xml"
deleted file mode 100644
index 69b4e62..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-Shift_JIS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-TIS-620.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-TIS-620.xml"
deleted file mode 100644
index ffd32a7..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-TIS-620.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="TIS-620"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-US-ASCII.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-US-ASCII.xml"
deleted file mode 100644
index 87ea8b0..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-US-ASCII.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16.xml"
deleted file mode 100644
index fec5530..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16BE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16BE.xml"
deleted file mode 100644
index 4358c0b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16BE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16LE.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16LE.xml"
deleted file mode 100644
index e8d2e0d..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-16LE.xml"
+++ /dev/null
Binary files differ
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-8.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-8.xml"
deleted file mode 100644
index a26f3bb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-UTF-8.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1250.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1250.xml"
deleted file mode 100644
index 68d656f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1250.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1251.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1251.xml"
deleted file mode 100644
index d2bc0c3..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1251.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1252.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1252.xml"
deleted file mode 100644
index d8ac585..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1252.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1253.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1253.xml"
deleted file mode 100644
index 59e6aec..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1253.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1253"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1254.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1254.xml"
deleted file mode 100644
index f80628f..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1254.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1254"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1255.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1255.xml"
deleted file mode 100644
index 7267270..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1255.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1255"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1256.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1256.xml"
deleted file mode 100644
index d5e0049..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1256.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1256"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1257.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1257.xml"
deleted file mode 100644
index b095a61..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1257.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1257"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1258.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1258.xml"
deleted file mode 100644
index 4fc5e9a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-1258.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-1258"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-31j.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-31j.xml"
deleted file mode 100644
index 938cfd5..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-windows-31j.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="windows-31j"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-CN.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-CN.xml"
deleted file mode 100644
index 3fdc641..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-CN.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-CN"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-TW.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-TW.xml"
deleted file mode 100644
index 348e37a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-EUC-TW.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-EUC-TW"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-JIS0208.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-JIS0208.xml"
deleted file mode 100644
index 62d07fd..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-JIS0208.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-JIS0208"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-Johab.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-Johab.xml"
deleted file mode 100644
index deaf87a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-Johab.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-Johab"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-MS950-HKSCS.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-MS950-HKSCS.xml"
deleted file mode 100644
index 5806b31..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-MS950-HKSCS.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-MS950-HKSCS"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-euc-jp-linux.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-euc-jp-linux.xml"
deleted file mode 100644
index 0b43dfb..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-euc-jp-linux.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-euc-jp-linux"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-mswin-936.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-mswin-936.xml"
deleted file mode 100644
index e1bf10a..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-mswin-936.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-mswin-936"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-949.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-949.xml"
deleted file mode 100644
index a8c93f4..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-949.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-949"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-950.xml" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-950.xml"
deleted file mode 100644
index 548e53b..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/test-x-windows-950.xml"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="x-windows-950"?>abcdefghijklmnopqrstuvwxyz
-1234567890
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
\ No newline at end of file
diff --git "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/testMethods.text" "b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/testMethods.text"
deleted file mode 100644
index 6f68f24..0000000
--- "a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 \0501.4.2_05-b04\051/xml/testMethods.text"
+++ /dev/null
@@ -1,193 +0,0 @@
-48
- public void testFile0() throws CoreException, IOException {
- String charsetName = "Big5";
- doGenTest(charsetName);
- }
- public void testFile1() throws CoreException, IOException {
- String charsetName = "Big5-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile2() throws CoreException, IOException {
- String charsetName = "EUC-JP";
- doGenTest(charsetName);
- }
- public void testFile3() throws CoreException, IOException {
- String charsetName = "EUC-KR";
- doGenTest(charsetName);
- }
- public void testFile4() throws CoreException, IOException {
- String charsetName = "GB18030";
- doGenTest(charsetName);
- }
- public void testFile5() throws CoreException, IOException {
- String charsetName = "GBK";
- doGenTest(charsetName);
- }
- public void testFile6() throws CoreException, IOException {
- String charsetName = "ISO-2022-JP";
- doGenTest(charsetName);
- }
- public void testFile7() throws CoreException, IOException {
- String charsetName = "ISO-2022-KR";
- doGenTest(charsetName);
- }
- public void testFile8() throws CoreException, IOException {
- String charsetName = "ISO-8859-1";
- doGenTest(charsetName);
- }
- public void testFile9() throws CoreException, IOException {
- String charsetName = "ISO-8859-13";
- doGenTest(charsetName);
- }
- public void testFile10() throws CoreException, IOException {
- String charsetName = "ISO-8859-15";
- doGenTest(charsetName);
- }
- public void testFile11() throws CoreException, IOException {
- String charsetName = "ISO-8859-2";
- doGenTest(charsetName);
- }
- public void testFile12() throws CoreException, IOException {
- String charsetName = "ISO-8859-3";
- doGenTest(charsetName);
- }
- public void testFile13() throws CoreException, IOException {
- String charsetName = "ISO-8859-4";
- doGenTest(charsetName);
- }
- public void testFile14() throws CoreException, IOException {
- String charsetName = "ISO-8859-5";
- doGenTest(charsetName);
- }
- public void testFile15() throws CoreException, IOException {
- String charsetName = "ISO-8859-6";
- doGenTest(charsetName);
- }
- public void testFile16() throws CoreException, IOException {
- String charsetName = "ISO-8859-7";
- doGenTest(charsetName);
- }
- public void testFile17() throws CoreException, IOException {
- String charsetName = "ISO-8859-8";
- doGenTest(charsetName);
- }
- public void testFile18() throws CoreException, IOException {
- String charsetName = "ISO-8859-9";
- doGenTest(charsetName);
- }
- public void testFile19() throws CoreException, IOException {
- String charsetName = "JIS_X0201";
- doGenTest(charsetName);
- }
- public void testFile20() throws CoreException, IOException {
- String charsetName = "JIS_X0212-1990";
- doGenTest(charsetName);
- }
- public void testFile21() throws CoreException, IOException {
- String charsetName = "KOI8-R";
- doGenTest(charsetName);
- }
- public void testFile22() throws CoreException, IOException {
- String charsetName = "Shift_JIS";
- doGenTest(charsetName);
- }
- public void testFile23() throws CoreException, IOException {
- String charsetName = "TIS-620";
- doGenTest(charsetName);
- }
- public void testFile24() throws CoreException, IOException {
- String charsetName = "US-ASCII";
- doGenTest(charsetName);
- }
- public void testFile25() throws CoreException, IOException {
- String charsetName = "UTF-16";
- doGenTest(charsetName);
- }
- public void testFile26() throws CoreException, IOException {
- String charsetName = "UTF-16BE";
- doGenTest(charsetName);
- }
- public void testFile27() throws CoreException, IOException {
- String charsetName = "UTF-16LE";
- doGenTest(charsetName);
- }
- public void testFile28() throws CoreException, IOException {
- String charsetName = "UTF-8";
- doGenTest(charsetName);
- }
- public void testFile29() throws CoreException, IOException {
- String charsetName = "windows-1250";
- doGenTest(charsetName);
- }
- public void testFile30() throws CoreException, IOException {
- String charsetName = "windows-1251";
- doGenTest(charsetName);
- }
- public void testFile31() throws CoreException, IOException {
- String charsetName = "windows-1252";
- doGenTest(charsetName);
- }
- public void testFile32() throws CoreException, IOException {
- String charsetName = "windows-1253";
- doGenTest(charsetName);
- }
- public void testFile33() throws CoreException, IOException {
- String charsetName = "windows-1254";
- doGenTest(charsetName);
- }
- public void testFile34() throws CoreException, IOException {
- String charsetName = "windows-1255";
- doGenTest(charsetName);
- }
- public void testFile35() throws CoreException, IOException {
- String charsetName = "windows-1256";
- doGenTest(charsetName);
- }
- public void testFile36() throws CoreException, IOException {
- String charsetName = "windows-1257";
- doGenTest(charsetName);
- }
- public void testFile37() throws CoreException, IOException {
- String charsetName = "windows-1258";
- doGenTest(charsetName);
- }
- public void testFile38() throws CoreException, IOException {
- String charsetName = "windows-31j";
- doGenTest(charsetName);
- }
- public void testFile39() throws CoreException, IOException {
- String charsetName = "x-EUC-CN";
- doGenTest(charsetName);
- }
- public void testFile40() throws CoreException, IOException {
- String charsetName = "x-euc-jp-linux";
- doGenTest(charsetName);
- }
- public void testFile41() throws CoreException, IOException {
- String charsetName = "x-EUC-TW";
- doGenTest(charsetName);
- }
- public void testFile42() throws CoreException, IOException {
- String charsetName = "x-JIS0208";
- doGenTest(charsetName);
- }
- public void testFile43() throws CoreException, IOException {
- String charsetName = "x-Johab";
- doGenTest(charsetName);
- }
- public void testFile44() throws CoreException, IOException {
- String charsetName = "x-MS950-HKSCS";
- doGenTest(charsetName);
- }
- public void testFile45() throws CoreException, IOException {
- String charsetName = "x-mswin-936";
- doGenTest(charsetName);
- }
- public void testFile46() throws CoreException, IOException {
- String charsetName = "x-windows-949";
- doGenTest(charsetName);
- }
- public void testFile47() throws CoreException, IOException {
- String charsetName = "x-windows-950";
- doGenTest(charsetName);
- }
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
deleted file mode 100644
index ef8b5c8..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html
deleted file mode 100644
index 84ca60e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,664 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html
deleted file mode 100644
index 3bcdd14..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,665 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML
-Editior, which is the Source page of the XML Editor. It also performs
-some integration testing. For example, it tests synchronization between
-the Design and Source pages of the XML Editor, as well as with the
-Outline and Properties views. It also verifies that files created
-through the XML File wizard and references to the XML Catalog are
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
- Setup
- ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
- <li> Delete any existing workbench</li>
- <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
- <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
- <LI>Select <B>Other...</B></LI>
- <LI>Select <B>XML</B></LI>
- <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
- <LI>Create a Project, <B>XMLTest2</B> </LI>
- <LI>Import the following files into this project:
- <UL>
- <LI><B>PurchaseOrder.xsd</B></LI>
- <LI><B>Invoice.dtd</B></LI>
- <LI><B>JobDesc.xml</B></LI>
- <LI><B>Wireless.xml</B></LI>
- <LI><B>gotchaTCBeans.set</B></LI>
- <LI><B>ATS.dtd</B></LI>
- <LI><FONT color="#ff0000">any others?</FONT></LI>
- </UL>
- </LI>
-</UL>
-
-<!-- ===========================================================
- Create/Open/Edit test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
- <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
- <LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromScratch</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL>
- </LI>
- <LI>Verify the following:
- <UL>
- <LI>fromScratch.xml appears in the Navigator view.</LI>
- <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
- <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
- <LI>the Design and Source page show no content.</LI>
- <LI>the Outline and Properties views show nothing.</LI>
- </UL>
- </LI>
- <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
- <LI>Right mouse button 2 and verify a popup menu appears.</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?></B></LI>
- <LI>Verify <?xml version="1.0" encoding="UTF-8"?> is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
- <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
- <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
- <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B><!DOCTYPE Invoice SYSTEM "Invoice.dtd"></B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
- <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
- <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
- <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
- <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
- <UL>
- <LI>Header</LI>
- <LI>Item</LI>
- <LI>comment</LI>
- </UL>
- </LI>
- <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
- <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
- <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
- <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
- <LI>Reopen the file and verify the changes were saved.</LI>
- <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
- <LI>Select the <B>File->New->XML File</B>.</LI>
- <LI>Verify the Create a XML File wizard appears.</LI>
- <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>fromLocalDTD</B></LI>
- <LI>Go to the Next page</LI>
- </UL>
- </LI>
- <LI>Select the <B>Import File</B> button
- <UL>
- <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
- <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
- <LI>Select <B>Finish</B> to close the Import File wizard</LI>
- </UL>
- </LI>
- <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
- <LI>Go to the Next page.</LI>
- <LI>Select <B>testcase</B> as the Root Element.</LI>
- <LI>Accept the default to <B>Create required content only</B>.</LI>
- <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
- <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>header</B> start tag.
- Verify <B>header</B> is selected in the Outline view and in the Design
- page and that the following properties and property values appear in the
- Properties view:
- <TABLE border="1">
- <TBODY>
- <TR>
- <TD width="100"><B>Property</B></TD>
- <TD width="76"><B>Value</B></TD>
- </TR>
- <TR>
- <TD width="100">category</TD>
- <TD width="76">webtool</TD>
- </TR>
- <TR>
- <TD width="100">number</TD>
- <TD width="76">idvalue0</TD>
- </TR>
- <TR>
- <TD width="100">state</TD>
- <TD width="76"> </TD>
- </TR>
- <TR>
- <TD width="100">subCategory</TD>
- <TD width="76">Accessability</TD>
- </TR>
- <TR>
- <TD width="100">subSubCategory</TD>
- <TD width="76"> </TD>
- </TR>
- </TBODY>
- </TABLE>
- </LI>
- <LI>From the Outline view, select the <B>testBucket</B> tag.
- Verify <B>testBucket</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
- with a value of <B>ComponentTest</B>.
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, and
- Properties view (focus here is on adding attributes and attribute values).
- <UL>
- <LI>From the Source page, use content assist to insert an attribute and attribute value
- for the <B>header</B> start tag.
- <UL>
- <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
- <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
- <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
- <LI>Select <B>state</B>.</LI>
- <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview"
- (a pulldown list of values should be available). Verify the change is reflected
- in the Source and Design pages.
- </LI>
- <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
- <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
- enough to know which attributes haven't been specified yet ... like content
- assist. Cool!).</LI>
- <LI>Type in a value of <B>Keyboard support</B>.</LI>
- <LI>Verify the change is reflected in the Source page and Properties view</LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
- <LI>Open the <B>Wireless.xml</B> file.</LI>
- <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
- <LI>Verify the Outline view and the formatting indentation reflect the proper
- element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI>
- <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
- <UL>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Prompt for content assist on the new line.</LI>
- <LI>Verify the following appear as proposals (in the order shown):
- <UL>
- <LI>head</LI>
- <LI>template</LI>
- <LI>card</LI>
- </UL>
- </LI>
- <LI>Create a new line after the <B>wml</B> start tag.</LI>
- <LI>Type a space before the ending delimiter on the card start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify the following appear as proposals (not necessarily in the
- order shown).
- <UL>
- <LI>title</LI>
- <LI>newcontext</LI>
- <LI>ordered</LI>
- <LI>xml:lang</LI>
- <LI>onenterbackward</LI>
- <LI>ontimer</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
- <LI>Prompt for content assist</LI>
- <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
- </UL>
- <LI>Verify selection synchronization between the Design page, Source page, Outline view,
- and Properties view.
- <UL>
- <LI>From the Source page, click within the <B>card</B> start tag.
- Verify <B>card</B> is selected in the Outline view and in the Design
- page and that the content assist proposals listed above for the
- <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
- <LI>From the Outline view, select the <B>postfield</B> tag.
- Verify <B>postfield</B> is selected in the Design page and the current marker
- in the lefthand margin of the Source page indicates the range of the
- <B>postfield</B> tag. The Properties view should show the following properties,
- none of which should have a value:
- <UL>
- <LI>name</LI>
- <LI>value</LI>
- <LI>id</LI>
- <LI>class</LI>
- </UL>
- </LI>
- </UL>
- </LI>
- <LI>Verify edit synchronization between the Design page, Source page, Outline view, and
- Properties view (focus here is on adding elements/tags).
- <UL>
- <LI>From the Source page, copy and paste the <B>card</B> tag.
- <UL>
- <LI>Position the cursor in the <B>card</B> start tag.</LI>
- <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
- <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
- <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
- <LI>Verify the appropriate lines were pasted n the Source page.
- Verify the Design page, Outline view, and the Properties
- view reflect this change.</LI>
- </UL>
- </LI>
- <LI>From the Design page, add another <B>card</B> tag.
- <UL>
- <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
- <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
- <LI>Verify the Source page, Outline view, and the Properties
- view reflect this change. NOTE: it should have generated out
- the same thing as the original card tag, with the exception
- that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
- </UL>
- </LI>
- </UL>
- </LI>
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
- <LI>
- <HR></LI>
- <li>Place the cursor after the <items> tag and besure "item" is
- listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure
-there is no web-app_2_2.dtd file in the directory. In the web.xml file
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the </display-name> tag, ctrl-space
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
- Save/Validate test cases
- ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
- <LI>If any files are open, select <B>File->Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Verify the following (no-changes-made condition):
- <UL>
- <LI><B>File->Save</B> is disabled.</LI>
- <LI><B>File->Save All</B> is disabled.</LI>
- <LI><B>File->Save As</B> is enabled.</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
- <LI>the <B>Save As</B> toolbar button is enabled.</LI>
- <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
- <LI>no <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Make a change in the Source page.</LI>
- <LI>Verify the following (changes-made condition):
- <UL>
- <LI><B>File->Save</B> is enabled.</LI>
- <LI><B>File->Save All</B> is enabled</LI>
- <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
- <LI><B>Save</B> is enabled on the Source popup menu.</LI>
- <LI>a <B>*</B> appears in the file tab.</LI>
- </UL></LI>
- <LI>Hit <B>Ctrl+S</B>. </LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Design page.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>File->Save All<B></B>.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Make a change in the Properties view.</LI>
- <LI>Verify the changes-made conditions apply.</LI>
- <LI>Select <B>Save</B> from the Source popup menu.</LI>
- <LI>Verify the no-changes-made conditions apply.</LI>
- <LI>Close and then reopen the file.</LI>
- <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
- <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
- <LI>Make a change to the file.</LI>
- <LI>Open another XML Perspective by:
- <UL>
- <LI><B>selecting Perspective->Open->Other...</B></LI>
- <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
- </UL></LI>
- <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
- <LI>Open the same xml file as in the first step above.</LI>
- <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
- <LI>Make some changes to the file in the second perspective.</LI>
- <LI>Verify these changes appear in the same file in the first perspective.</LI>
- <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
- <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
- <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
- <LI>Go to the Next page
- <UL>
- <LI>Select <B>XMLTest2</B> as the folder</LI>
- <LI>Specify a File name of <B>NonWellFormed</B></LI>
- <LI>Select <B>Finish</B></LI>
- </UL></LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select <B><?xml version="1.0" encoding="UTF-8"?>.</B></LI>
- <LI>Create a new line after the XML declaration.</LI>
- <LI>Prompt for content assist.</LI>
- <LI>Select comment.</LI>
- <LI>Embed more than 2 consecutive dashes in the comment.
- <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
- <LI>Type in the remaining lines as shown below:
- <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause
- a document to not be well-formed):</FONT>
- <UL>
- <LI>create a start and end tag that don't match in their case sensitivity
- (e.g., <tag> and </Tag>). </LI>
- <LI>create a start and end tag where the start tag contains an attribute value that is not
- enclosed in quotes.
- <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
- <LI>create tags that are not properly nested.
- <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
- <LI>create a start tag without a corresonding end tag.
- <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the
- tag is an empty tag, in which case the shorthand version can be used (<shortTag/>)).</FONT></LI>
- <LI>do not provide an attribute value (="value").
- <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have
- only one value, but it's not valid in XML)</FONT></LI>
- <LI>define an attribute more than once in a start tag.</LI>
- </UL></LI>
- <LI>Save the file.</LI>
- <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
- lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
- and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
- <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!-- removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
- Source Specific test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
- <LI>Open <B>JobDesc.xml</B>.</LI>
- <LI>Double-clicking within tag content:
- <UL>
- <LI>Double-click within <B>Middleware</B> on line 7.</LI>
- <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within a tag name:
- <UL>
- <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
- <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view.
- <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the
- Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click again at the same cursor position.</LI>
- <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected
- in the Source page. <B>HowToApply</B> should remain selected in
- the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute name:
- <UL>
- <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
- <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
- <LI>Double-clicking within an attribute value:
- <UL>
- <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
- <LI>Scroll down such that line 61 is visible.</LI>
- <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected
- in the Source page and <B>HowToApply</B> is selected in the Design page and Outline
- view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in
- the Properties view. Only <B>distribute</B> should show a value.</LI>
- <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
- selected in the Source. Nothing should change in the Design page or views.</LI>
- <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
- <LI>Double-clicking again will cause cycling back to the original selection.</LI>
- </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes.
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
- Other test cases
- ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
- <LI>Window->Preferences<B></B>.</LI>
- <LI>Expand <B>Workbench</B>.</LI>
- <LI>Select <B>File Editors</B>.</LI>
- <LI>Select the <B>Add</B> button to add a new file type.</LI>
- <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
- <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
- <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
- <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
- <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
- <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html
deleted file mode 100644
index f772113..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html
deleted file mode 100644
index 070e4fe..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html
deleted file mode 100644
index ba30c9f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html
deleted file mode 100644
index 254cde4..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content=text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
- <FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
- <FRAMESET cols="160,*">
- <FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
- <FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
- </FRAMESET>
- <NOFRAMES>
- <BODY>
- <P>To view this page, you need a browser that supports frames.</P>
- </BODY>
- </NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.html
deleted file mode 100644
index acbd519..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotesUTF16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.html
deleted file mode 100644
index d8d62de..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16BOM.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.html
deleted file mode 100644
index 0afe69b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16be.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.html b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.html
deleted file mode 100644
index f4efb61..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/utf16le.html
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e68..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cf..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 7656902..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page
-language="java"
-%>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a08..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-3"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c18..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e817..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jsp
deleted file mode 100644
index 324c9fb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16BOM.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e6916..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jsp
deleted file mode 100644
index bb72378..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16be.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jsp
deleted file mode 100644
index 4873cbe..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
deleted file mode 100644
index 5772f2f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16le_xmlStyle.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp
deleted file mode 100644
index 83c870f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- contentType="text/html; charset=SHIFT_JIS" pageEncoding="SHIFT_JIS"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp
deleted file mode 100644
index 92051b3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
-<jsp:directive.page language="java"
- contentType="text/html; charset=SHIFT_JIS" pageEncoding="SHIFT_JIS" />
-<jsp:text><![CDATA[ <?xml version="1.0" encoding="SHIFT_JIS" ?> ]]></jsp:text>
-<jsp:text><![CDATA[ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> ]]></jsp:text>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=SHIFT_JIS" />
-<meta name="GENERATOR" content="IBM WebSphere Studio" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<link href="theme/Master.css" rel="stylesheet"
- type="text/css" />
-<title>testshiftjis.jsp</title>
-</head>
-<body>
-<p>Place testshiftjis.jsp's content here.</p>
-</body>
-</html>
-</jsp:root>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp
deleted file mode 100644
index 31b47c0..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp
+++ /dev/null
@@ -1,194 +0,0 @@
-<%@ page language="java" pageEncoding="Shift_JIS" contentType="text/html; charset=Shift_JIS"%>
-<%@taglib uri="/WEB-INF/websitedesigner.tld" prefix="siteedit"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META name="GENERATOR"
- content="IBM WebSphere Studio Homepage Builder Version 6.5.0.0 for Windows">
-<META http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-<META http-equiv="Content-Style-Type" content="text/css">
-<TITLE>Audi A6wüÜÅ</TITLE>
-<LINK rel="stylesheet" href="style.css" type="text/css">
-<LINK rel="stylesheet" type="text/css" id="website_style"
- href="/Audi/site-comp/style/site.css">
-</HEAD>
-<BODY text="#666699" link="#6666cc" vlink="#999999" alink="#cc66ff">
-<siteedit:layout>
- <siteedit:layoutarea id="body">
- <H1>Audi A6wüÜÅ</H1>
-
- <DIV align="left">
- <TABLE width="640" cellpadding="5" cellspacing="0">
- <TBODY>
- <TR>
- <TD bgcolor="#0000cc" height="5"><FONT color="#ffffff">wüÜÅÌoÜ</FONT></TD>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">11</FONT></TD>
- <TD bgcolor="#0000cc" width="5"></TD>
- </TR>
- <TR>
- <TD width="216" bgcolor="#0066cc" valign="top" rowspan="3"></TD>
- <TD width="420">
- <UL>
- <LI>2001N11 AúMy Carð¢µnßéB</LI>
- <LI>RÍ...
- <OL>
- <LI>2002N4Å5NÚð}¦éOÔuÉש¢Ì᪢Ģ½B</LI>
- <LI>GWÌñͳÉäªÅ«ÈÈÁÄ«½B</LI>
- </OL>
- </LI>
- <LI>ȺÌÔíªóâÆÈÁ½B
- <OL>
- <LI>VOLVO V70</LI>
- <LI>BWM 325i touring</LI>
- <LI>VW Passart V6 4 Motion</LI>
- <LI>Mercedes-Benz C Class Wagon</LI>
- <LI>Audi A4 Avant</LI>
- </OL>
- <BR>
- »¤B ±Ì_Å<B>`UÍ®SÈXR[vO</B>Å Á½B</LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc" width="5" height="5"></TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD width="420">±±©çAȺÌRªåÅAóâÔªiçê½B<BR>
- i ÜÅàÆÈÌÂlIåÏÉæèÜ·Bj
- <UL>
- <LI>VOLVO V70 - fUCªXÅ{cB</LI>
- <LI>BWM 325i touring - r¼[ÈTCYAXBWM¾ç¯Å{cB</LI>
- <LI>C Class - ¿iÉ©íÈ¢GWAàÅ{cB</LI>
- <LI>Passart - ¿iÍ£ÍI¾ªàOfUCÅ{cB</LI>
- </UL>
- »¤B±±Å<B>cÁ½ÌÍA4 Avant</B>ŵ½B <BR>
- A4 3.0 quattro sportsÉæµAÆÄàCÉüÁĵܢܵ½B<BR>
- µ©µ\èÍ2002N2Æ̱ÆÅA»±ÜÅÒƤÆêxÍßܵ½B<BR>
- <BR>
- BêACÉÈÁÄ¢½ÌͺàÌTCYÆgNeʪV70ÉäשÈ謳ÈéÆ¢¤_ŵ½B</TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc"></TD>
- <TD bgcolor="#0066cc"><FONT color="#ffffff">12{</FONT></TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc"></TD>
- <TD><BR>
- 2ÜÅÒƤÆvÁÄ¢éóÔÅAA4ÌÇÁîñð¾æ¤Æv¢fB[[ɧ¿ñèÁ½Æ±ëASÌcÆÌûªsÝÅX·ÆbðµÜµ½B<BR>
- <BR>
- »±ÅAVOLVO©çÌæè·¦AÆ°\¬i4ljðl¦éÆA6ª¨©ßÆ̱ÆB <B>¿i·àõðl¦éÆA4 Avant
- 3.0 quattro suportÆA6 Avant 3.0 quatrroÌ·ªÙÆñÇÈ¢</B>Æ̱ÆB<BR>
- <BR>
- XɺæèLy[ÅA¼CO[J[©çÌæÖ¦ÌêA¸èz{<B>RO~</B>{[iXÆÈèAÆÁÄਢ¾´ªoÜ·B<BR>
- <BR>
- »µÄANà[ÔÂ\Èó]FiVo[CN^bNjÌ`Uª1äÝɪ éÆ̱ÆB<BR>
- <BR>
- ÅADZÌbÉæÁÄ(æ¹çêÄHjA<B><FONT color="#cc33ff">A6 3.0 Avant quattro
- 2002 Model</FONT></B>ðwüèµÜµ½B<BR>
- <BR>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">wüèII</FONT></TD>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">wüèÌRðÜÆßéÆA</FONT>A</TD>
- <TD bgcolor="#0000cc"></TD>
- </TR>
- <TR>
- <TD width="216" bgcolor="#0066cc" valign="top"></TD>
- <TD width="420">
- <UL>
- <LI>¼ÌóâÔÆärµÄA{fB¨æÑÔàóÔÌfUCðå¢ÉCÉüÁ½B</LI>
- <LI>`SÅÍuVOÉä×ÔàXy[Xª·ÈÁĵܤB</LI>
- <LI>NAgEVXeiskiªï¡ÈÌÅâÍèsnow driveÉÍ4WDª~µÄ...)</LI>
- <LI>lø«ÆÁʺæèLy[¾Á½F|j</LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc" valign="top" colspan="2"><FONT
- color="#ffffff">wüµ½f ¨æÑ ÇÁIvV</FONT></TD>
- <TD bgcolor="#0000cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc" valign="top"></TD>
- <TD>
- <UL>
- <LI>f
- <UL>
- <LI><B><FONT color="#cc33ff">A6 3.0 Avant quattro 2002 Model</FONT></B>
- </LI>
- <LI>ÚµÍ`ÌItBVy[Wð²¾³¢B( <A
- href="http://www.audi.co.jp/models/index.html">http://www.audi.co.jp/models/index.html</A>
- )</LI>
- </UL>
- </LI>
- <LI>{fBEJ[
- <UL>
- <LI>Vo[CN^bN</LI>
- </UL>
- </LI>
- <LI>ÇÁIvV
- <UL>
- <LI>[tAeipAOXy[T[ i@B®Ôêp̽ßj</LI>
- <LI>QbWgC (XL[ÂEu[cAqÌì
¹ïðÏÝÞ½ßÌD¯pj</LI>
- <LI>op[Ûìpo[ iÈÌv]Å.....)</LI>
- <LI>X^bhXE^C - uWXg uUbN</LI>
- </UL>
- </LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">1st CvbV</FONT></TD>
- <TD bgcolor="#0000cc"></TD>
- <TD bgcolor="#0000cc" height="5"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0066cc" valign="top"><IMG src="image211.jpg"
- border="0" width="195" height="130"></TD>
- <TD>wüè©çANÌQ½¾µ¢úŵ½ª2TÔƵÄ[ÔB<BR>
- 3úãÉcêÉrÉs\èŵ½ÌÅAX^bhX
µÄàç¢Üµ½B<BR>
- <UL>
- <LI><FONT color="#ff00ff"><FONT color="#ff00ff"><B>Pros.</B></FONT></FONT>
- <UL>
- <LI>X[YÈGWB</LI>
- <LI>Àèµ½èi[ÔµÄ3úãÌXm[EhCuÍÆÄàõKŵ½jB</LI>
- <LI>ã¿ÅL¢ºàB</LI>
- <LI>vÁ½æèà«È¢Rïi¬ðÜßA»Ý½Ï6.5Km/LBj</LI>
- <LI>XÅ Ü诶Ô𩩯ȢF|j</LI>
- </UL>
- </LI>
- <LI><B><FONT color="#000033">Cons.</FONT></B>
- <UL>
- <LI>WÚÌmÉr[Rªt¢Ä¢È¢B<BR>
- iaØîñªuhbr¾¯ÅÍs\ªBÈOpµÄ¢½pCIjAÐ yirÍÇ©Á½Bj</LI>
- <LI>ÙíÈ碼®AªêéB gNðJ¯éÆèª^ÁB</LI>
- <LI>¿åÁÆÓíÓíµ½«ñèB</LI>
- <LI>uVOÆä×A¸ÁĵÜÁ½gNeÊB</LI>
- </UL>
- </LI>
- </UL>
- </TD>
- <TD bgcolor="#0066cc"></TD>
- </TR>
- <TR>
- <TD bgcolor="#0000cc"><FONT color="#ffffff">P|[gɱ........</FONT><A
- href="audi_1month.html"><IMG src="b016lis.gif" width="16"
- height="16" border="0"></A></TD>
- <TD bgcolor="#0000cc"></TD>
- <TD bgcolor="#0000cc" height="5"></TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- </siteedit:layoutarea>
-</siteedit:layout>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml
deleted file mode 100644
index e80692b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml
deleted file mode 100644
index 38a1bce..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australië
-</tag>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl
deleted file mode 100644
index bd66482..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australië
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml
deleted file mode 100644
index e2d8afd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml
deleted file mode 100644
index e2ec98f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xml
deleted file mode 100644
index 9eec539..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml
deleted file mode 100644
index 198112c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml
deleted file mode 100644
index 2359bd6..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<Person>
- <Address>
- <City>ÂçÏÂ</City>
- <State>¿ÀÆàÀî</State>
- <Zip>M1C 5C2</Zip>
- <Country>ÆüËÜ</Country>
- </Address>
- <Name>
- <First>°ìϺ</First>
- <Last>ÎëÌÚ</Last>
- </Name>
-</Person>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml
deleted file mode 100644
index a94bcf8..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>
-<Person>
- <Address>
- <City>åa</City>
- <State>_Þì</State>
- <Zip>M1C 5C2</Zip>
- <Country>ú{</Country>
- </Address>
- <Name>
- <First>êY</First>
- <Last>éØ</Last>
- </Name>
-</Person>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml
deleted file mode 100644
index a5095e3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml
deleted file mode 100644
index 0d5c1fb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml
deleted file mode 100644
index d611a31..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml
deleted file mode 100644
index 2f422fd..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml
deleted file mode 100644
index 21eae02..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8 standalone="yes"?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml
deleted file mode 100644
index c90c65d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml
deleted file mode 100644
index b263fc2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml
deleted file mode 100644
index 30b8e94..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml
deleted file mode 100644
index 69aa27e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml
deleted file mode 100644
index 1e6549d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
- <?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml
deleted file mode 100644
index ca5fc53..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml
deleted file mode 100644
index 575dbaa..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xml
deleted file mode 100644
index 4d9e817..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml
deleted file mode 100644
index d39d4d0..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml
deleted file mode 100644
index 8c05b4a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
- <?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml
deleted file mode 100644
index 88b8d08..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
- <?xml version="1.0" encoding="UTF-8" ?>
-</test>
-
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml
deleted file mode 100644
index 47e6916..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml
deleted file mode 100644
index d7ffd6d..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xml
deleted file mode 100644
index 0f6e37b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xml
deleted file mode 100644
index 7c8cdf2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16be.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xml
deleted file mode 100644
index 95b530e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16beMalformed.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xml
deleted file mode 100644
index 7d9ba3f..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16le.xml
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xml b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xml
deleted file mode 100644
index 7cefcd2..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16leMalformed.xml
+++ /dev/null
Binary files differ
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 76c6027..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.classpath
+++ /dev/null
@@ -1,11 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <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 42e94a0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-temp.folder
-build.xml
-validatexmltests.jar
-javaCompiler.validatexmltests.jar.args
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 112562f..0000000
--- 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 afa5c91..0000000
--- 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.core.runtime.prefs b/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
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 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 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=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-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=error
-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=error
-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=ignore
-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 301c7ad..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
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 c59368c..0000000
--- 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 fc522bb..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-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 7f99413..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +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.600.qualifier
-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.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xml.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xml.core.internal.validation.errorcustomization;x-internal:=true,
- org.eclipse.wst.xml.validation.tests.internal;x-internal:=true
-Require-Bundle: org.junit;bundle-version=3.8.2,
- 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
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
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 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties
deleted file mode 100644
index 70b0b16..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-###############################################################################
-bin.includes = test.xml,\
- testresources/,\
- validatexmltests.jar,\
- META-INF/,\
- about.html,\
- plugin.properties
-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 c095862..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xml.validation.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-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 6f3e054..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/XMLValidationConfigurationTest.java
+++ /dev/null
@@ -1,144 +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.
- }
- }
-
- /**
- * Test the default setting of the WARN_NO_GRAMMAR feature.
- */
- public void testIndicateNoGrammarFeatureDefault()
- {
- try
- {
- assertEquals("The INDICATE_NO_GRAMMAR feature is not set by default to Ignore.", 1, configuration.getIntFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR));
- }
- catch(Exception e)
- {
- fail("Unable to set read the WARN_NO_GRAMMAR feature: " + e);
- }
- }
-}
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 0259719..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/eclipse/ValidatorTest.java
+++ /dev/null
@@ -1,185 +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 enabled.
- * 2. Test that setting the preference to disabled works.
- * 3. Test that setting the preference to enabled works.
- */
- public void testWarnNoGrammarPreference()
- {
- // Test that the default preference is disabled.
- validator.setupValidation(null);
- assertNotSame("The default warn no grammar preference is not enabled.", new Integer(0), new Integer(validator.getIndicateNoGrammarPreference()));
-
- // Test that the preference is read when disabled.
- XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR, 0);
- validator.setupValidation(null);
- assertEquals("The warn no grammar preference is not ignore when the preference is set to ignore.", 0, validator.getIndicateNoGrammarPreference());
-
- // Test that the preference is read when enabled.
- XMLCorePlugin.getDefault().getPluginPreferences().setValue(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR, 2);
- validator.setupValidation(null);
- assertEquals("The warn no grammar preference is not error when the preference is set to error.", 2, validator.getIndicateNoGrammarPreference());
-
- }
-
-}
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 2476cce..0000000
--- 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 int getIndicateNoGrammarPreference()
- {
- return indicateNoGrammar;
- }
-}
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 4dbf3cb..0000000
--- 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 f0055c9..0000000
--- 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 8e1a096..0000000
--- 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 4b45d1e..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/core/internal/validation/errorcustomization/ErrorCustomizationManagerTest.java
+++ /dev/null
@@ -1,165 +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.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-import org.eclipse.wst.xml.core.internal.validation.XMLValidator;
-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;
-import org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin;
-
-/**
- * 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());
- }
-
- /**
- * Test that an error customizer is only called for the
- * correct element.
- */
- public void testErrorReportedOnCorrectElement()
- {
- IErrorMessageCustomizer testCustomizer = new IErrorMessageCustomizer()
- {
- public String customizeMessage(ElementInformation elementInfo, String key, Object[] arguments)
- {
- if(elementInfo.getLocalname().equals("child1"))
- {
- fail("An error was reported for the child1 element.");
- }
- return null;
- }
- };
- ErrorCustomizationRegistry registry = ErrorCustomizationRegistry.getInstance();
- registry.addErrorMessageCustomizer("http://www.example.org/simplenested", testCustomizer);
- try
- {
- String PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml";
-
- XMLValidator validator = new XMLValidator();
- validator.validate(uri, null, new XMLValidationConfiguration());
- validator.validate(uri, null, new XMLValidationConfiguration());
- }
- catch(IOException e)
- {
- fail("An exception occurred while running the test:" + e);
- }
- }
-}
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 68202bc..0000000
--- 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 bb03412..0000000
--- 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 2e02d73..0000000
--- 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 24f7e49..0000000
--- 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 eb87161..0000000
--- 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 7b61828..0000000
--- 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 5ccd6cd..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 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("XML Validation Test Suite");
- 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);
- addTestSuite(XIncludeTest.class);
- addTestSuite(HonourAllSchemaLocationsTest.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 36d3379..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,95 +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 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);
- configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 0);
- }
- 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 4006d8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,186 +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);
- configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 1);
- }
- catch(Exception e)
- {
- fail("Unable to set configuration WARN_NO_GRAMMAR.");
- }
- runTest(testfile, keys, numErrors, numWarnings);
- try
- {
- configuration.setFeature(XMLValidationConfiguration.WARN_NO_GRAMMAR, false);
- configuration.setFeature(XMLValidationConfiguration.INDICATE_NO_GRAMMAR, 0);
- }
- catch(Exception e)
- {
- fail("Unable to set configuration WARN_NO_GRAMMAR.");
- }
- }
-
- /**
- * Test /bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml.
- */
- public void testNoNamespaceSchema()
- {
- String testname = "NoNamespaceSchema";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "NoNamespaceSchema/" + testname + ".xml";
- List keys = new ArrayList();
- keys.add("cvc-complex-type.2.4.b");
- 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/HonourAllSchemaLocationsTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java
deleted file mode 100644
index 29e6b8b..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/HonourAllSchemaLocationsTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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 org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-
-
-/**
- * Tests the "honour all schema locations" feature.
- */
-public class HonourAllSchemaLocationsTest extends BaseTestCase
-{
- public void testHonoursAllSchemaLocations()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- public void testCanTurnOffHonourAllSchemaLocations()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, false);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- keys.add(null);
- keys.add("cvc-complex-type.2.4.d"); //$NON-NLS-1$
- int numErrors = 2;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- private String getTestFile()
- {
- return FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "XMLExamples/HonourAllSchemaLocations/A-instance.xml"; //$NON-NLS-1$
- }
-}
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 51b6506..0000000
--- 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 f2390c0..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM 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/XIncludeTest.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java
deleted file mode 100644
index 719ab54..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XIncludeTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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 org.eclipse.wst.xml.core.internal.validation.XMLValidationConfiguration;
-
-
-/**
- * Tests the XInclude feature.
- */
-public class XIncludeTest extends BaseTestCase
-{
- public void testSupportsXInclude()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.USE_XINCLUDE, true);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- int numErrors = 0;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- public void testCanTurnOffXInclude()
- {
- try
- {
- configuration.setFeature(XMLValidationConfiguration.USE_XINCLUDE, false);
- }
- catch (Exception e)
- {
- fail();
- }
-
- String testFile = getTestFile();
- List keys = new ArrayList();
- keys.add("cvc-complex-type.2.4.a");
- int numErrors = 1;
- int numWarnings = 0;
-
- runTest(testFile, keys, numErrors, numWarnings);
- }
-
- private String getTestFile()
- {
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + "XMLExamples/XInclude/master.xml";
- return testfile;
- }
-}
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 2511f63..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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 76ee31d..0000000
--- 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 bea3313..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.validation.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.validation.tests.internal.AllXMLTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- 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 4985c9a..0000000
--- 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 0e1bd52..0000000
--- 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 2e0f4d0..0000000
--- 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 c805ecf..0000000
--- 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 ab01a09..0000000
--- 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 3bbedb6..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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\051InPath/CloseBracketInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/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\051InPath/CloseBracketInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/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\051InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.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\051InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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\041InPath/ExclamationInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/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\041InPath/ExclamationInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation\041InPath/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\041InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.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\041InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.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\050InPath/OpenBracketInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/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\050InPath/OpenBracketInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/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\050InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.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\050InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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\047InPath/QuoteInPathInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/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\047InPath/QuoteInPathValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote\047InPath/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\047InFilenameInvalid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml"
deleted file mode 100644
index 9ef6646..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.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\047InFilenameValid.xml" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xml"
deleted file mode 100644
index bf35cb1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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 9ef6646..0000000
--- 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 bf35cb1..0000000
--- 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/HonourAllSchemaLocations/A-instance.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml
deleted file mode 100644
index 8aa7395..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A-instance.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<nsA:A xmlns:nsA="urn:nsA" xmlns:p="urn:nsB" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:nsA A.xsd ">
- <p:B1>p:B1</p:B1>
- <p:B2>p:B2</p:B2>
-</nsA:A>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd
deleted file mode 100644
index 0a43e77..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/A.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsA" elementFormDefault="qualified"
- xmlns="http://www.w3.org/2001/XMLSchema" xmlns:nsB="urn:nsB" xmlns:nsA="urn:nsA">
-
- <import namespace="urn:nsB" schemaLocation="B1.xsd"/>
- <import namespace="urn:nsB" schemaLocation="B2.xsd"/>
- <element name="A">
- <complexType>
- <sequence>
- <element ref="nsB:B1"></element>
- <element ref="nsB:B2"></element>
- </sequence>
- </complexType>
- </element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd
deleted file mode 100644
index 68a85a4..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B1.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsB" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="B1" type="string"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd
deleted file mode 100644
index c4ece00..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/HonourAllSchemaLocations/B2.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="urn:nsB" elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="B2" type="string"></element>
-</schema>
\ 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 0737ba6..0000000
--- 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 b79af27..0000000
--- 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 b79af27..0000000
--- 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 15ba3ea..0000000
--- 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 f9e9874..0000000
--- 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 2749876..0000000
--- 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 d4ff9fd..0000000
--- 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 2749876..0000000
--- 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/XInclude/body.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml
deleted file mode 100644
index 4c85730..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/body.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="master.xsd"/>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml
deleted file mode 100644
index 7fbae72..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<master xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="master.xsd">
- <!-- <body/> -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="body.xml"/>
-</master>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd
deleted file mode 100644
index 034f57a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/XInclude/master.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="master">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="body" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="body"/>
-</xs:schema>
\ No newline at end of file
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 8c60a40..0000000
--- 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 19e8db6..0000000
--- 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 421b8bc..0000000
--- 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/CustomErrorReportedOnCorrectElement/simplenested.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml
deleted file mode 100644
index 8ce7ba6..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns="http://www.example.org/simplenested" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/simplenested simplenested.xsd ">
- <child1>child1</child1>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd
deleted file mode 100644
index 2cf5ad2..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CustomErrorReportedOnCorrectElement/simplenested.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/simplenested" xmlns:tns="http://www.example.org/simplenested">
-
- <element name="root">
- <complexType>
- <sequence>
-
- <element ref="tns:child1"></element>
- <element ref="tns:child2"></element>
- </sequence>
- </complexType>
- </element>
- <element name="child1" type="string"></element>
- <element name="child2" type="string"></element>
-
-</schema>
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 e69de29..0000000
--- 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 089c886..0000000
--- 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/NoNamespaceSchema/NoNamespaceSchema.xml b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml
deleted file mode 100644
index 00f19a1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="NoNamespaceSchema.xsd">
- <child1>child1</child1>
-</root>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd b/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd
deleted file mode 100644
index e2b0f24..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NoNamespaceSchema/NoNamespaceSchema.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="root" type="RootType"></xsd:element>
- <xsd:complexType name="RootType">
- <xsd:sequence>
- <xsd:element name="child1" type="xsd:string"></xsd:element>
- <xsd:element name="child2" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ 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 8099b2a..0000000
--- 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 b4e44ef..0000000
--- 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 904d0a1..0000000
--- 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 e995d8b..0000000
--- 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 2849b97..0000000
--- 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
diff --git a/tests/org.eclipse.wst.xsd.core.tests/.classpath b/tests/org.eclipse.wst.xsd.core.tests/.classpath
deleted file mode 100644
index 23e61fd..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/.classpath
+++ /dev/null
@@ -1,11 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/.project b/tests/org.eclipse.wst.xsd.core.tests/.project
deleted file mode 100644
index b425b09..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xsd.core.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.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35bdab8..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Jan 09 16:45:03 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 2a8c10d..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.core.tests
-Bundle-Version: 1.0.500.qualifier
-Bundle-ClassPath: xsdcoretests.jar
-Bundle-Activator: org.eclipse.wst.xsd.core.tests.internal.XSDCoreTestsPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="3.8.0",
- org.eclipse.wst.xsd.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,2.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsd.core.tests.internal
diff --git a/tests/org.eclipse.wst.xsd.core.tests/about.html b/tests/org.eclipse.wst.xsd.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/build.properties b/tests/org.eclipse.wst.xsd.core.tests/build.properties
deleted file mode 100644
index 26df813..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
- xsdcoretests.jar,\
- plugin.properties,\
- about.html,\
- testresources/,\
- test.xml
-source.xsdcoretests.jar = src/
-output.xsdcoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.xsd.core.tests/plugin.properties b/tests/org.eclipse.wst.xsd.core.tests/plugin.properties
deleted file mode 100644
index bc4ce4c..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xsd.core.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = XSD Core Tests Plugin
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java
deleted file mode 100644
index bb9a2b1..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/AllXSDCoreTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.core.tests.internal;
-import junit.framework.Test;
-/**
- * The root test suite that contains all other XSD Core test suites.
- */
-public class AllXSDCoreTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXSDCoreTests();
- }
-
- /**
- * Constructor
- */
- public AllXSDCoreTests()
- {
- super("AllXSDCoreTests");
- addTest(BugFixesTest.suite());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java
deleted file mode 100644
index 95fb1a7..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.core.tests.internal;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/";
- protected String IDEAL_RESULTS_DIR = "testresources/idealResults/";
- protected String LOG_FILE_LOCATION = "results.log";
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- PLUGIN_ABSOLUTE_PATH = XSDCoreTestsPlugin.getInstallURL();
- }
-
- protected String locateFileUsingCatalog(String namespaceURI)
- {
- URIResolver resolver = URIResolverPlugin.createResolver();
- String result = resolver.resolve("", namespaceURI, "");
- String resolvedURI = resolver.resolvePhysicalLocation("", namespaceURI, result);
- if (resolvedURI == null || resolvedURI.length() == 0)
- {
- return namespaceURI;
- }
- return resolvedURI;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
deleted file mode 100644
index 2c38003..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2012 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
- * David Carver - STAR - bug 157254
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.core.tests.internal;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xsd.contentmodel.internal.CMDocumentFactoryXSD;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.DocumentationImpl;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl.XSDModelGroupAdapter;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.osgi.framework.Bundle;
-
-/**
- * Test class for bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- protected 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);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- // Add tests here
-
- @SuppressWarnings("unchecked")
- public void testXSIType()
- {
- String soapSchemaURI = locateFileUsingCatalog("http://schemas.xmlsoap.org/wsdl/soap/");
-
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
-
- CMDocument cmDocument = factory.createCMDocument(soapSchemaURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
-
- CMNamedNodeMap elements = cmDocument.getElements();
-
- boolean foundDesiredElement = false;
- for (Iterator<CMElementDeclaration> i = elements.iterator(); i.hasNext(); )
- {
- CMElementDeclaration element = i.next();
- if ("binding".equals(element.getElementName()))
- {
- foundDesiredElement = true;
-
- CMNamedNodeMap attributes = element.getAttributes();
- assertNotNull(attributes); // Three attributes: required, transport and style
- assertTrue(attributes.getLength() == 3); // If the xsi:type was present, it would be 4 attributes
-
- CMNode attrNode = null;
-
- attrNode = attributes.getNamedItem("required");
- assertNotNull(attrNode);
- attrNode = attributes.getNamedItem("transport");
- assertNotNull(attrNode);
- attrNode = attributes.getNamedItem("style");
- assertNotNull(attrNode);
- attrNode = attributes.getNamedItem("type"); // Should be null!
- assertNull(attrNode);
- break;
- }
- }
- assertTrue(foundDesiredElement); // if we didn't even find the binding element, then something terrible went wrong
- }
-
-// @SuppressWarnings("unchecked")
-// public void testStackOverflow()
-// {
-// String namespaceURI = "http://www.w3.org/TR/voicexml20/vxml.xsd";
-// String vxmlSchemaURI = locateFileUsingCatalog(namespaceURI);
-//
-// // See bug 206138
-//
-// // Two ways to test this.
-// // First way. Call findTypesDerivedFrom from XSDImpl.
-//
-// assertNotNull("unable to locate file for " + namespaceURI, vxmlSchemaURI);
-// assertTrue("unable to locate file for " + namespaceURI, vxmlSchemaURI.length() > 0);
-// XSDSchema xsdSchema = XSDImpl.buildXSDModel(vxmlSchemaURI);
-// assertNotNull("failed to build model for " + vxmlSchemaURI,xsdSchema);
-// boolean foundDesiredType = false;
-// for (Iterator<XSDTypeDefinition> types = xsdSchema.getTypeDefinitions().iterator(); types.hasNext(); )
-// {
-// XSDTypeDefinition type = types.next();
-// if (type instanceof XSDComplexTypeDefinition)
-// {
-// XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) type;
-// if ("basic.event.handler".equals(complexType.getName()))
-// {
-// foundDesiredType = true;
-// List<XSDTypeDefinition> list = XSDImpl.findTypesDerivedFrom(complexType);
-// int size = list.size();
-// // assertTrue(size == 1); // if we got something back, then great, there was no out of stack error
-// assertTrue("no types found in XSD", size >= 0);
-// // Because of bug 203048, there is a change in behaviour to redefined types.
-// // The complex type named speaker is no longer circular. In terms of this junit, the value returned is not relevant
-// // since we just want some length back (i.e. there was no crash from a stack overflow).
-// break;
-// }
-// }
-// }
-// assertTrue("type \"basic.event.handler\" not found in XSD", foundDesiredType); // if we didn't even find the complex type, then something terrible went wrong
-//
-// // Second way to test via content model
-//
-// CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
-// assertNotNull("Assert factory is not null", factory);
-//
-// CMDocument cmDocument = factory.createCMDocument(vxmlSchemaURI);
-// assertNotNull("Assert CMDocument is not null", cmDocument);
-//
-// CMNamedNodeMap elements = cmDocument.getElements();
-//
-// boolean foundDesiredElement = false;
-// for (Iterator<CMElementDeclaration> i = elements.iterator(); i.hasNext(); )
-// {
-// CMElementDeclaration element = i.next();
-// if ("noinput".equals(element.getElementName()))
-// {
-// CMNamedNodeMap attributes = element.getAttributes();
-// assertNotNull(attributes);
-// // assertTrue(attributes.getLength() == 3); // if we got something back, then great, there was no out of stack error
-// // Because of bug 203048, there is a change in behaviour to redefined types.
-// // The complex type named speaker is no longer circular. In terms of this junit, the value returned is not relevant
-// // since we just want some length back (i.e. there was no crash from a stack overflow).
-// assertTrue(attributes.getLength() >= 0);
-// foundDesiredElement = true;
-// break;
-// }
-// }
-// assertTrue("element \"noinput\"r not found in XSD", foundDesiredElement); // if we didn't even find the noinput element, then something terrible went wrong
-// }
-
- public void testXSDTypeWhitespaceFacets() {
- // Bug [194698] - Test that the correct whitespace facets are applied to the types
- String XSD_FILE_NAME = "XSDWhitespace.xsd";
- String fileURI = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_FILE_NAME;
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
- CMDocument cmDocument = factory.createCMDocument(fileURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
- CMElementDeclaration elemDecl = (CMElementDeclaration)cmDocument.getElements().item(0);
- assertEquals("test", elemDecl.getNodeName());
- assertTrue(elemDecl.getContent() instanceof XSDModelGroupAdapter);
- XSDModelGroupAdapter group = (XSDModelGroupAdapter) elemDecl.getContent();
- CMNodeList list = group.getChildNodes();
- XSDElementDeclarationAdapter adapter = null;
-
- String nodeName = null, expected = null;
- CMDataType type = null;
- // Iterate over the child nodes of the element, examining the whitespace facets */
- for(int i = 0; i < list.getLength(); i++) {
- adapter = (XSDElementDeclarationAdapter) list.item(i);
-
- nodeName = adapter.getNodeName();
- assertNotNull(nodeName);
- assertTrue(nodeName.contains("-"));
- type = adapter.getDataType();
- assertNotNull(type);
-
- expected = nodeName.substring(nodeName.indexOf('-') + 1);
- assertEquals(expected, type.getProperty(XSDImpl.PROPERTY_WHITESPACE_FACET));
- }
- }
-
- public void testXSITypeVsTypeAttr()
- {
-
- // See bug 225447, 225819
-
- // Load the XSD file
- String XSD_FILE_NAME = "XSITypeTest.xsd";
- String fileURI = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + XSD_FILE_NAME;
- CMDocumentFactoryXSD factory = new CMDocumentFactoryXSD();
- assertNotNull("Assert factory is not null", factory);
- CMDocument cmDocument = factory.createCMDocument(fileURI);
- assertNotNull("Assert CMDocument is not null", cmDocument);
-
- // Check and obtain the two global elements (elementA and elementB)
- CMNamedNodeMap elements = cmDocument.getElements();
- assertEquals(elements.getLength(), 2);
- CMElementDeclaration cmElementDeclaration = (CMElementDeclaration)elements.item(0);
- CMElementDeclaration cmElementDeclarationA = null;
- CMElementDeclaration cmElementDeclarationB = null;
- if ("elementA".equals(cmElementDeclaration.getElementName()))
- {
- cmElementDeclarationA = cmElementDeclaration;
- cmElementDeclarationB = (CMElementDeclaration)elements.item(1);
- }
- else
- {
- cmElementDeclarationB = cmElementDeclaration;
- cmElementDeclarationA = (CMElementDeclaration)elements.item(1);
- }
-
- // elementA has a "type" attribute with "X" enumerated value, make sure it appears in the model
- CMNamedNodeMap attributesA = cmElementDeclarationA.getAttributes();
- assertEquals(attributesA.getLength(), 1);
- CMAttributeDeclaration cmAttributeDeclarationA = (CMAttributeDeclaration)attributesA.item(0);
- assertEquals("type", cmAttributeDeclarationA.getAttrName());
- CMDataType attrTypeA = cmAttributeDeclarationA.getAttrType();
- String[] enumeratedValuesA = attrTypeA.getEnumeratedValues();
- assertEquals(1, enumeratedValuesA.length);
- assertEquals("X", enumeratedValuesA[0]);
-
- // elementB does not have a "type" attribute, make sure the xsi:type appears in the model
- CMNamedNodeMap attributesB = cmElementDeclarationB.getAttributes();
- assertEquals(attributesB.getLength(), 1);
- CMAttributeDeclaration cmAttributeDeclarationB = (CMAttributeDeclaration)attributesB.item(0);
- assertEquals("type", cmAttributeDeclarationB.getAttrName());
- CMDataType attrTypeB = cmAttributeDeclarationB.getAttrType();
- assertEquals("typeNames", attrTypeB.getDataTypeName());
- }
-
- public void testEnumerationsInComplexTypesWithSimpleContent()
- {
- // See bug 215514
-
- // Obtain the Web Application schema
- String vxmlSchemaURI = locateFileUsingCatalog("http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd");
- assertNotNull("unable to locate file for " + vxmlSchemaURI, vxmlSchemaURI);
- assertTrue("unable to locate file for " + vxmlSchemaURI, vxmlSchemaURI.length() > 0);
- XSDSchema xsdSchema = XSDImpl.buildXSDModel(vxmlSchemaURI);
- assertNotNull("failed to build model for " + vxmlSchemaURI,xsdSchema);
-
- // The type transport-guaranteeType is defined as a complex type with simple type content
- // It has 3 enumerated values
- String typeName = "transport-guaranteeType";
- for (Iterator<XSDTypeDefinition> types = xsdSchema.getTypeDefinitions().iterator(); types.hasNext();)
- {
- XSDTypeDefinition type = types.next();
- if (type instanceof XSDComplexTypeDefinition)
- {
- XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)type;
- if (typeName.equals(complexType.getName()))
- {
- String[] enumeratedValuesForType = XSDImpl.getEnumeratedValuesForType(complexType);
- // Ensure that the 3 enumerated values are returned
- assertEquals(3, enumeratedValuesForType.length);
- return;
- }
- }
- }
- }
-
- public void testGlobalElementDocumentation()
- {
- // See bug 157254
-
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/documentation/globalreftest.xsd");
-
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- CMNamedNodeMap elements = document.getElements();
-
- CMElementDeclaration node = (CMElementDeclaration)elements.getNamedItem("rootTest");
- assertNotNull("Missing rootElement", node);
-
- CMElementDeclaration testElement = (CMElementDeclaration)node.getLocalElements().getNamedItem("test");
- assertNotNull("Missing test element", testElement);
-
- CMNodeList documentation = (CMNodeList)testElement.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("test global element missing documentation.");
- }
- for (int cnt = 0; cnt < documentation.getLength(); cnt++) {
- DocumentationImpl doc = (DocumentationImpl) documentation.item(cnt);
- assertEquals("Test global element missing documentation.", "This some global documentation", doc.getValue());
- }
-
- testElement = (CMElementDeclaration)node.getLocalElements().getNamedItem("testElement");
- documentation = (CMNodeList)testElement.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("testElement local element missing documentation.");
- }
- for (int cnt = 0; cnt < documentation.getLength(); cnt++) {
- DocumentationImpl doc = (DocumentationImpl) documentation.item(cnt);
- assertEquals("testElement documentation wrong.", "This is an override", doc.getValue());
- }
- }
-
- public void testGlobalAtrributeDocumentation()
- {
- // See bug 157254
-
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/documentation/TestAttributeRefs.xsd");
-
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- CMNamedNodeMap elements = document.getElements();
-
- CMElementDeclaration node = (CMElementDeclaration)elements.getNamedItem("object");
- assertNotNull("Missing object element", node);
-
- CMNamedNodeMap attributes = node.getAttributes();
- testGlobalAttr1Documentation(attributes);
- testGlobalAttr2Documentation(attributes);
- testGlobalAttr3Documentation(attributes);
- testGlobalAttr4Documentation(attributes);
- testLocalAttrDocumentation(attributes);
-
- }
-
- public void testForBug176420() {
- // Obtain the model from /testresources/samples/testSchemaForBug176420.xsd
- Bundle bundle = Platform.getBundle("org.eclipse.wst.xsd.core.tests");
- URL url = bundle.getEntry("/testresources/samples/testSchemaForBug176420.xsd");
- CMDocument document = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull("Content model loaded Null", document);
-
- // Obtain the enumerated values of the root element
- CMNode cmNode = document.getElements().item(0);
- String[] enumeratedValues = ((CMElementDeclaration)cmNode).getDataType().getEnumeratedValues();
-
- // Verify that all 12 enumerated values are included
- assertEquals(12, enumeratedValues.length);
- }
-
- private void testLocalAttrDocumentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("localAttr");
- assertNotNull("Missing localAttr attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for localAttr");
- }
- assertEquals("Wrong number of documentation annotations.", 2, documentation.getLength());
- assertEquals("Incorrect annotation for localAttr:",
- "PASS! Multiple documentation elements for local attribute part 1",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
- assertEquals("Incorrect annotation for localAttr:",
- "PASS! Multiple documentation elements for local attribute part 2",
- ((DocumentationImpl)documentation.item(1)).getValue().trim());
- }
-
-
- private void testGlobalAttr1Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr1");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for globalAttr1");
- }
- assertEquals("Wrong number of documentation annotations.", 2, documentation.getLength());
- assertEquals("Incorrect first annotation for globalAttr1:",
- "PASS! Documentation for attribute ref overrides the resolved attribute ref documentation",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
-
- assertEquals("Incorrect second annotation for globalAttr1:",
- "PASS! Multiple documentation elements.",
- ((DocumentationImpl)documentation.item(1)).getValue().trim());
- }
-
- private void testGlobalAttr2Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr2");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for globalAttr2");
- }
- assertEquals("Wrong number of documentation annotations.", 1, documentation.getLength());
- assertEquals("Incorrect annotation for globalAttr2:",
- "PASS! Documentation for resolved attribute ref when the attribute ref does not have documentation",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
- }
-
- private void testGlobalAttr3Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr3");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Unable to find documentation for globalAttr3");
- }
- assertEquals("Wrong number of documentation annotations.", 1, documentation.getLength());
- assertEquals("Incorrect annotation for globalAttr3:",
- "PASS! Documentation for resolved attribute ref when the attribute ref has an annotation but does not have documentation",
- ((DocumentationImpl)documentation.item(0)).getValue().trim());
- }
-
- private void testGlobalAttr4Documentation(CMNamedNodeMap attributes) {
- CMAttributeDeclaration attribute = (CMAttributeDeclaration) attributes.getNamedItem("globalAttr4");
- assertNotNull("Missing globalAttr1 attribute.");
-
- CMNodeList documentation = (CMNodeList)attribute.getProperty("documentation");
- if (documentation.getLength() == 0) {
- fail("Documentation element not returned for globalAttr4");
- }
- assertNull("globalAttr4 returned data when non expected.", ((DocumentationImpl)documentation.item(0)).getValue());
- }
-
- /**
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=322841
- */
- public void testBase64BinaryDefaultValue()
- {
- Bundle bundle = Platform.getBundle(XSDCoreTestsPlugin.PLUGIN_ID);
- URL url = bundle.getEntry("/testresources/samples/base64Binary/Test.xsd"); //$NON-NLS-1$
-
- CMDocument cmDocument = XSDImpl.buildCMDocument(url.toExternalForm());
- assertNotNull(cmDocument);
-
- CMNamedNodeMap elements = cmDocument.getElements();
-
- CMElementDeclaration cmElementDeclaration = (CMElementDeclaration)elements.getNamedItem("Test"); //$NON-NLS-1$
- assertNotNull(cmElementDeclaration);
-
- CMDataType dataType = cmElementDeclaration.getDataType();
- assertNotNull(dataType);
-
- String impliedValue = dataType.generateInstanceValue();
- assertEquals("MA==", impliedValue); //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java b/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java
deleted file mode 100644
index fa74cea..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/src/org/eclipse/wst/xsd/core/tests/internal/XSDCoreTestsPlugin.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.core.tests.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XSDCoreTestsPlugin extends Plugin
-{
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.xsd.core.tests";
- protected static Bundle pluginBundle;
-
- // The shared instance
- private static XSDCoreTestsPlugin plugin;
-
- /**
- * The constructor
- */
- public XSDCoreTestsPlugin()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- plugin = this;
- pluginBundle = context.getBundle();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- plugin = null;
- pluginBundle = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static XSDCoreTestsPlugin getDefault()
- {
- return plugin;
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public static String getInstallURL()
- {
- try
- {
- return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.core.tests/test.xml b/tests/org.eclipse.wst.xsd.core.tests/test.xml
deleted file mode 100644
index f79cf81..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xsd.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xsd.core.tests.internal.AllXSDCoreTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd
deleted file mode 100644
index 2c6491c..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSDWhitespace.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="test" type="xsdTest" />
- <!-- Define a simple type to test that the hierarchy overriding whitespace rule is observed -->
- <xsd:simpleType name="CollapsedString">
- <xsd:restriction base="xsd:string">
- <xsd:whiteSpace value="collapse" />
- </xsd:restriction>
- </xsd:simpleType>
- <!-- Define a simple type to test that the whitespace rule is inherited from the ancestor -->
- <xsd:simpleType name="Normalized">
- <xsd:restriction base="xsd:normalizedString"></xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="xsdTest">
- <xsd:sequence>
- <!-- Whitespace should be replaced -->
- <xsd:element name="simple-replace" type="xsd:normalizedString" />
- <xsd:element name="integer-collapse" type="xsd:nonNegativeInteger" />
- <!-- Whitespace should collapse -->
- <xsd:element name="token-collapse" type="xsd:token" />
- <!-- Whitespace should be preserved -->
- <xsd:element name="string-preserve" type="xsd:string" />
- <!-- Whitespace should collapse -->
- <xsd:element name="duration-collapse" type="xsd:duration" />
- <xsd:element name="extended-collapse" type="CollapsedString" />
- <xsd:element name="extended-replace" type="Normalized" />
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd
deleted file mode 100644
index 1439647..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/XSITypeTest.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/NewXMLSchema"
- xmlns:tns="http://www.example.org/NewXMLSchema" elementFormDefault="qualified">
- <complexType name="typeA">
- <attribute name="type" use="required">
- <simpleType>
- <restriction base="string">
- <enumeration value="X"></enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- <complexType name="typeB">
- </complexType>
- <complexType name="typeC">
- <complexContent>
- <extension base="tns:typeA">
- </extension>
- </complexContent>
- </complexType>
- <complexType name="typeD">
- <complexContent>
- <extension base="tns:typeB">
- </extension>
- </complexContent>
- </complexType>
- <element name="elementA" type="tns:typeA"></element>
- <element name="elementB" type="tns:typeB"></element>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/base64Binary/Test.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/base64Binary/Test.xsd
deleted file mode 100644
index 2f66b63..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/base64Binary/Test.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/Test"
- xmlns:tns="http://www.example.org/Test" elementFormDefault="qualified">
-
- <element name="Test" type="base64Binary" />
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd
deleted file mode 100644
index 37c20aa..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/TestAttributeRefs.xsd
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:element name="object" type="object"></xsd:element>
- <xsd:complexType name="object">
- <xsd:attribute ref="globalAttr1" use="required">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Documentation for attribute ref overrides the resolved attribute ref documentation
- </xsd:documentation>
- <xsd:documentation>
- PASS! Multiple documentation elements.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute ref="globalAttr2" use="required"></xsd:attribute>
- <xsd:attribute ref="globalAttr3" use="required">
- <xsd:annotation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute ref="globalAttr4" use="required">
- <xsd:annotation>
- <xsd:documentation></xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="localAttr" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Multiple documentation elements for local attribute part 1
- </xsd:documentation>
- <xsd:documentation>
- PASS! Multiple documentation elements for local attribute part 2
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- <xsd:attribute name="globalAttr1">
- <xsd:annotation>
- <xsd:documentation>
- FAILED! Documentation for resolved attribute ref. If this doc shows, it's a bug.
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:pattern value="[a-zA-Z0-9_]+"></xsd:pattern>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:attribute name="globalAttr2" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Documentation for resolved attribute ref when the attribute ref does not have documentation
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="globalAttr3" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- PASS! Documentation for resolved attribute ref when the attribute ref has an annotation but does not have documentation
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="globalAttr4" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>
- FAILED! Documentation for attribute ref is empty. This documentation should not display.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd
deleted file mode 100644
index 54f8676..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/documentation/globalreftest.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- * David Carver - STAR - bug 157254 - Test file for documentation
- *******************************************************************************/
- -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/globalreftest" xmlns="http://www.example.org/globalreftest" elementFormDefault="qualified">
- <xsd:element name="rootTest" type="TestType"/>
- <xsd:element name="test" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>This some global documentation</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="testElement" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Some more testing</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:complexType name="TestType">
- <xsd:sequence>
- <xsd:element ref="test" minOccurs="0" maxOccurs="1"/>
- <xsd:element ref="testElement" minOccurs="0" maxOccurs="1">
- <xsd:annotation>
- <xsd:documentation>This is an override</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="testAttribute" type="AttributeTestType" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="AttributeTestType">
- <xsd:sequence>
- <xsd:element name="test2" type="xsd:string"/>
- </xsd:sequence>
- <xsd:attribute name="testAt" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo/>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="testAtWithDoc" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>Attribute Documentation</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd b/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd
deleted file mode 100644
index 4bcaf57..0000000
--- a/tests/org.eclipse.wst.xsd.core.tests/testresources/samples/testSchemaForBug176420.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/testSchemaForBug176420"
- xmlns:tns="http://www.example.org/testSchemaForBug176420"
- elementFormDefault="qualified">
- <simpleType name="numbersType">
- <restriction base="string">
- <enumeration value="1"/>
- <enumeration value="2"/>
- <enumeration value="3"/>
- <enumeration value="4"/>
- </restriction>
- </simpleType>
- <simpleType name="lettersType">
- <restriction base="string">
- <enumeration value="a"/>
- <enumeration value="b"/>
- <enumeration value="c"/>
- <enumeration value="d"/>
- </restriction>
- </simpleType>
- <simpleType name="unionType">
- <union memberTypes="tns:lettersType tns:numbersType tns:union2Type" />
- </simpleType>
- <element name="element" type="tns:unionType"></element>
- <simpleType name="numbers2Type">
- <restriction base="string">
- <enumeration value="4"/>
- <enumeration value="5"/>
- <enumeration value="6"/>
- </restriction>
- </simpleType>
- <simpleType name="letters2Type">
- <restriction base="string">
- <enumeration value="d"/>
- <enumeration value="e"/>
- <enumeration value="f"/>
- </restriction>
- </simpleType>
- <simpleType name="union2Type">
- <union memberTypes="tns:letters2Type tns:numbers2Type"/></simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.classpath b/tests/org.eclipse.wst.xsd.ui.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.project b/tests/org.eclipse.wst.xsd.ui.tests/.project
deleted file mode 100644
index a9aa178..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xsd.ui.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.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1900f21..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,70 +0,0 @@
-#Wed Jul 23 11:19:13 EDT 2008
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9b44b17..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jul 22 12:13:51 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 199e55e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.ui.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: xsduitests.jar
-Bundle-Activator: org.eclipse.wst.xsd.ui.tests.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version=3.8.2,
- org.eclipse.wst.xsd.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/about.html b/tests/org.eclipse.wst.xsd.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/build.properties b/tests/org.eclipse.wst.xsd.ui.tests/build.properties
deleted file mode 100644
index 9d56d8d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 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
-###############################################################################
-bin.includes = META-INF/,\
- build.properties,\
- testresources/,\
- plugin.properties,\
- test.xml,\
- xsduitests.jar,\
- about.html
-jars.compile.order = xsduitests.jar
-source.xsduitests.jar = src/
-output.xsduitests.jar = bin/
-
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/plugin.properties b/tests/org.eclipse.wst.xsd.ui.tests/plugin.properties
deleted file mode 100644
index f4c46b9..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xsd.ui.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = XSD UI Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java
deleted file mode 100644
index c7081ab..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/Activator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin
-{
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.xsd.ui.tests";
- private static Bundle pluginBundle = null;
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator()
- {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
- * )
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- plugin = this;
- pluginBundle = context.getBundle();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
- * )
- */
- public void stop(BundleContext context) throws Exception
- {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault()
- {
- return plugin;
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public static String getInstallURL()
- {
- try
- {
- return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java
deleted file mode 100644
index a12fb86..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/AllXSDUITests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Wrapper test suite for all XSD UI tests.
- */
-public class AllXSDUITests extends TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXSDUITests();
- }
-
- /**
- * Constructor
- */
- public AllXSDUITests()
- {
- super("AllXSDUITests");
- // XSD Includes tests
- addTest(ChameleonIncludesTest.suite());
- // Testing used imports aren't removed (ensure logic to determine
- // what is or what is not used is correct)
- addTest(ImportsTest.suite());
- // Unused XSD imports tests
- addTest(XSDUnusedTests.suite());
- // XSD xml ns table cleanup
- addTest(XSDXMLNSCleanupTests.suite());
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java
deleted file mode 100644
index 1634b3d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests.internal;
-
-import junit.framework.TestCase;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.tests.Activator;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-
-public class BaseTestCase extends TestCase
-{
- protected static final String PLUGIN_ABSOLUTE_PATH = Activator.getInstallURL();
- protected static final String RESOURCES_FOLDER = "testresources"; //$NON-NLS-1$
- protected static final String TC_ROOT_FOLDER = PLUGIN_ABSOLUTE_PATH + "/" + RESOURCES_FOLDER + "/XSD"; //$NON-NLS-1$
- protected XSDDirectivesManager importManager = new XSDDirectivesManager();
-
- public BaseTestCase()
- {
- }
-
- public BaseTestCase(String name)
- {
- super(name);
- }
-
- protected XSDSchema getXSDSchema(String path)
- {
- URI uri = URI.createFileURI(path);
- ResourceSet resourceSet = new ResourceSetImpl();
- XSDResourceImpl resource = (XSDResourceImpl) resourceSet.getResource(uri, true);
- XSDSchema schema = resource.getSchema();
- assertNotNull(schema);
- return schema;
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java
deleted file mode 100644
index 64d18f4..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ChameleonIncludesTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests.internal;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-
-public class ChameleonIncludesTest extends BaseTestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(ChameleonIncludesTest.class);
- }
-
- public void testChameleonTest001()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest002()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- }
-
- public void testChameleonTest003()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest004()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- }
-
- public void testChameleonTest005()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest006()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest007()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType3.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest008()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest009()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest010()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest011()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByElement/Used/Main-CT.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest012()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByElement/Used/Main-Group.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest013()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-CT.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest014()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-Group.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest015()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest016()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest017()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-List.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest018()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest019()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest020()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest021()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Restriction.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest022()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest023()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testChameleonTest024()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union3.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java
deleted file mode 100644
index 89e33be..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/ImportsTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests.internal;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-
-public class ImportsTest extends BaseTestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(ImportsTest.class);
- }
-
- public void testImport001()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttribute/Used/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport002()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttribute/Unused/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- }
-
- public void testImport003()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttributeGroup/Used/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport004()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByAttributeGroup/Unused/Main.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- }
-
- public void testImport005()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport006()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport007()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType3.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport008()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport009()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport010()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport011()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByElement/Used/Main-CT.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport012()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByElement/Used/Main-Group.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport013()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByGroupDefinition/Used/Main-CT.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport014()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefByGroupDefinition/Used/Main-Group.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport015()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport016()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport017()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-List.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport018()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport019()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport020()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport021()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Restriction.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport022()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Union1.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport023()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Union2.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport024()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/ImportsWithNamespace/RefBySimpleType/Used/Main-Union3.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java
deleted file mode 100644
index 5644947..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDUnusedTests.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests.internal;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-
-public class XSDUnusedTests extends BaseTestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDUnusedTests.class);
- }
-
- public void testImport001()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Simple/Test.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("Import001.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testImport001RepeatRemovalOnce()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Simple/Test.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("Import001.xsd".equals(d1.getSchemaLocation()));
-
- importManager.performRemoval(schema);
- list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport001RepeatRemovalTwice()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Simple/Test.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("Import001.xsd".equals(d1.getSchemaLocation()));
-
- importManager.performRemoval(schema);
- list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
-
- importManager.performRemoval(schema);
- list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
-
- public void testImport002()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main001.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testImport003()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main002.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testImport004()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main003.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport005()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main004.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Import3.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport006()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main005.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 5);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(2);
- assertTrue("../Import2.xsd".equals(d2.getSchemaLocation()));
- XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(3);
- assertTrue("../Import3.xsd".equals(d3.getSchemaLocation()));
- XSDSchemaDirective d4 = (XSDSchemaDirective) list.get(4);
- assertTrue("../Import4.xsd".equals(d4.getSchemaLocation()));
- XSDSchemaDirective d5 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d5.getSchemaLocation()));
- }
-
- public void testImport007()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main006.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testImport008()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main007.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport009()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main008.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport010()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Import1.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testImport011()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009a.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 0);
- }
-
- public void testImport012()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009b.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include2.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include3.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport013()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009c.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 3);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
- XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
- assertTrue("../Include3.xsd".equals(d3.getSchemaLocation()));
- }
-
- public void testImport014()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009d.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include3.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport015()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009e.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include2.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testImport016()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009f.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 5);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../A.xsd".equals(d2.getSchemaLocation()));
- XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
- assertTrue("../Include5.xsd".equals(d3.getSchemaLocation()));
-
- XSDSchemaDirective d4 = (XSDSchemaDirective) list.get(3);
- assertTrue("../Include2.xsd".equals(d4.getSchemaLocation()));
- XSDSchemaDirective d5 = (XSDSchemaDirective) list.get(4);
- assertTrue("../Include3.xsd".equals(d5.getSchemaLocation()));
- }
-
- public void testImport017()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009g.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 2);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
- }
-
- public void testImport018()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main009h.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 3);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include5.xsd".equals(d2.getSchemaLocation()));
- XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
- assertTrue("../Include3.xsd".equals(d3.getSchemaLocation()));
- }
-
- public void testCircularIncludes001()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Includes/circular/test/Main001.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 1);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include4.xsd".equals(d1.getSchemaLocation()));
- }
-
- public void testCircularIncludes002()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Includes/circular/test/Main002.xsd");
- importManager.performRemoval(schema);
- List list = importManager.getUnusedXSDDirectives();
- assertTrue(list.size() == 6);
- XSDSchemaDirective d1 = (XSDSchemaDirective) list.get(0);
- assertTrue("../Include1.xsd".equals(d1.getSchemaLocation()));
- XSDSchemaDirective d2 = (XSDSchemaDirective) list.get(1);
- assertTrue("../Include2.xsd".equals(d2.getSchemaLocation()));
- XSDSchemaDirective d3 = (XSDSchemaDirective) list.get(2);
- assertTrue("../Include3.xsd".equals(d3.getSchemaLocation()));
- XSDSchemaDirective d4 = (XSDSchemaDirective) list.get(3);
- assertTrue("../Include4.xsd".equals(d4.getSchemaLocation()));
- XSDSchemaDirective d5 = (XSDSchemaDirective) list.get(4);
- assertTrue("../Include5.xsd".equals(d5.getSchemaLocation()));
- XSDSchemaDirective d6 = (XSDSchemaDirective) list.get(5);
- assertTrue("../Include6.xsd".equals(d6.getSchemaLocation()));
-
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java b/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java
deleted file mode 100644
index 60c4743..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/src/org/eclipse/wst/xsd/ui/tests/internal/XSDXMLNSCleanupTests.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 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.xsd.ui.tests.internal;
-
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDXMLNSCleanupTests extends BaseTestCase
-{
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDXMLNSCleanupTests.class);
- }
-
- public void testCleanup001()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main001.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 0);
- assertTrue(usedPrefixes.size() == 14);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns01"));
- assertTrue(usedPrefixes.contains("tns02"));
- assertTrue(usedPrefixes.contains("tns03"));
- assertTrue(usedPrefixes.contains("tns04"));
- assertTrue(usedPrefixes.contains("tns05"));
- assertTrue(usedPrefixes.contains("tns06"));
- assertTrue(usedPrefixes.contains("tns07"));
- assertTrue(usedPrefixes.contains("tns08"));
- assertTrue(usedPrefixes.contains("tns09"));
- assertTrue(usedPrefixes.contains("tns10"));
- assertTrue(usedPrefixes.contains("tns11"));
- assertTrue(usedPrefixes.contains("tns12"));
- assertTrue(usedPrefixes.contains("p"));
- }
-
- public void testCleanup002()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main002.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains("tns05"));
-
- assertTrue(usedPrefixes.size() == 6);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns01"));
- assertTrue(usedPrefixes.contains("tns02"));
- assertTrue(usedPrefixes.contains("tns03"));
- assertTrue(usedPrefixes.contains("tns04"));
- assertTrue(usedPrefixes.contains("p"));
- }
-
- public void testCleanup003()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main003.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 0);
- assertTrue(usedPrefixes.size() == 14);
- assertTrue(usedPrefixes.contains("xsd"));
- assertTrue(usedPrefixes.contains("tns01"));
- assertTrue(usedPrefixes.contains("tns02"));
- assertTrue(usedPrefixes.contains("tns03"));
- assertTrue(usedPrefixes.contains("tns04"));
- assertTrue(usedPrefixes.contains("tns05"));
- assertTrue(usedPrefixes.contains("tns06"));
- assertTrue(usedPrefixes.contains("tns07"));
- assertTrue(usedPrefixes.contains("tns08"));
- assertTrue(usedPrefixes.contains("tns09"));
- assertTrue(usedPrefixes.contains("tns10"));
- assertTrue(usedPrefixes.contains("tns11"));
- assertTrue(usedPrefixes.contains("tns12"));
- assertTrue(usedPrefixes.contains("p"));
- }
-
- public void testCleanup004()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main004.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 12);
- assertTrue(unusedPrefixes.contains("tns02"));
- assertTrue(unusedPrefixes.contains("tns03"));
- assertTrue(unusedPrefixes.contains("tns04"));
- assertTrue(unusedPrefixes.contains("tns05"));
- assertTrue(unusedPrefixes.contains("tns06"));
- assertTrue(unusedPrefixes.contains("tns07"));
- assertTrue(unusedPrefixes.contains("tns08"));
- assertTrue(unusedPrefixes.contains("tns09"));
- assertTrue(unusedPrefixes.contains("tns10"));
- assertTrue(unusedPrefixes.contains("tns11"));
- assertTrue(unusedPrefixes.contains("tns12"));
- assertTrue(unusedPrefixes.contains(null));
-
- assertTrue(usedPrefixes.size() == 3);
- assertTrue(usedPrefixes.contains("xsd"));
- assertTrue(usedPrefixes.contains("tns01"));
- assertTrue(usedPrefixes.contains("p"));
- }
-
- public void testCleanup005()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main005.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 12);
- assertTrue(unusedPrefixes.contains("tns01"));
- assertTrue(unusedPrefixes.contains("tns02"));
- assertTrue(unusedPrefixes.contains("tns03"));
- assertTrue(unusedPrefixes.contains("tns04"));
- assertTrue(unusedPrefixes.contains("tns05"));
- assertTrue(unusedPrefixes.contains("tns06"));
- assertTrue(unusedPrefixes.contains("tns07"));
- assertTrue(unusedPrefixes.contains("tns08"));
- assertTrue(unusedPrefixes.contains("tns09"));
- assertTrue(unusedPrefixes.contains("tns10"));
- assertTrue(unusedPrefixes.contains("tns11"));
- assertTrue(unusedPrefixes.contains("tns12"));
-
- assertTrue(usedPrefixes.size() == 3);
- assertTrue(usedPrefixes.contains("xsd"));
- assertTrue(usedPrefixes.contains("p"));
- assertTrue(usedPrefixes.contains(null));
- }
-
- public void testCleanup006()
- {
- // Null target namespace schema
-
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main006.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains("tns01"));
- assertTrue(usedPrefixes.size() == 3);
- assertTrue(usedPrefixes.contains("xsd"));
- assertTrue(usedPrefixes.contains("p"));
- // This was added since references were made without a prefix
- assertTrue(usedPrefixes.contains(null));
-
- }
-
- public void testCleanup007()
- {
- // Test Unused Null Prefix
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main007.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains(null));
- assertTrue(usedPrefixes.size() == 3);
- assertTrue(usedPrefixes.contains("xsd"));
- assertTrue(usedPrefixes.contains("p"));
- assertTrue(usedPrefixes.contains("tns"));
-
- }
-
- public void testCleanup008()
- {
- // Test Used Null Prefix
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/xmlnsCleanup/test/Main008.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains("p"));
- assertTrue(usedPrefixes.size() == 3);
- assertTrue(usedPrefixes.contains("xsd"));
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- }
-
- // Using the test XSDs from the Unused folder
- public void testCleanup009()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main001.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 0);
- assertTrue(usedPrefixes.size() == 2);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- }
-
- // Using the test XSDs from the Unused folder
- public void testCleanup010()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main002.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains("imp"));
- assertTrue(usedPrefixes.size() == 2);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- }
-
- // Using the test XSDs from the Unused folder
- public void testCleanup011()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main003.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains("imp"));
- assertTrue(usedPrefixes.size() == 2);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- }
-
- // Using the test XSDs from the Unused folder
- public void testCleanup012()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main004.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 1);
- assertTrue(unusedPrefixes.contains("imp"));
- assertTrue(usedPrefixes.size() == 2);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- }
-
- // Using the test XSDs from the Unused folder
- public void testCleanup013()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main005.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 2);
- assertTrue(unusedPrefixes.contains("imp"));
- assertTrue(unusedPrefixes.contains("imp4"));
- assertTrue(usedPrefixes.size() == 2);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- }
-
- // Using the test XSDs from the Unused folder
- public void testCleanup014()
- {
- XSDSchema schema = getXSDSchema(TC_ROOT_FOLDER + "/Unused/test/Main006.xsd");
- importManager.performRemoval(schema);
- Set unusedPrefixes = importManager.getUnusedPrefixes();
- Set usedPrefixes = importManager.getUsedPrefixes();
- assertTrue(unusedPrefixes.size() == 0);
- assertTrue(usedPrefixes.size() == 3);
- assertTrue(usedPrefixes.contains(null));
- assertTrue(usedPrefixes.contains("tns"));
- assertTrue(usedPrefixes.contains("p"));
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/test.xml b/tests/org.eclipse.wst.xsd.ui.tests/test.xml
deleted file mode 100644
index 2222477..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
- <property
- name="plugin-name"
- value="org.eclipse.wst.xsd.ui.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xsd.ui.tests.internal.AllXSDUITests" />
- <property
- name="testType"
- value="ui-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd
deleted file mode 100644
index b2bfc2a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/Include1.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:complexType name="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="ImpGr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="ImpAttr1" type="ImpST1"></xsd:attribute>
-
- <xsd:attributeGroup name="ImpAttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="ImpElem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="ImpST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="ImpST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="ImpCT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd
deleted file mode 100644
index 192925f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Unused/Main.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attribute ref="MainAttribute"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:attribute name="MainAttribute" type="xsd:string"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd
deleted file mode 100644
index 3d16c33..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttribute/Used/Main.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attribute ref="ImpAttr1"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd
deleted file mode 100644
index e562da3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Unused/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attributeGroup ref="MainAttributeGroup1"></xsd:attributeGroup>
- </xsd:complexType>
-
- <xsd:attributeGroup name="MainAttributeGroup1">
- <xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd
deleted file mode 100644
index 039d24a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByAttributeGroup/Used/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attributeGroup ref="ImpAttrGr1"></xsd:attributeGroup>
- </xsd:complexType>
-
- <xsd:attributeGroup name="MainAttributeGroup1">
- <xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd
deleted file mode 100644
index 839a1aa..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:extension base="MainCT2"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd
deleted file mode 100644
index 73e2825..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType2.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:restriction base="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" minOccurs="1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:minLength value="1"></xsd:minLength>
- <xsd:maxLength value="10"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd
deleted file mode 100644
index 78769fb..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-BaseType3.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="MainCT1">
- <xsd:sequence>
- <xsd:element
- name="elem1" type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index a4a6167..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="MainCT1"></xsd:element>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index c20fe2e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="MainCT2"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index bd7fea7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="MainCT1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType1.xsd
deleted file mode 100644
index 93e8423..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:extension base="ImpCT1"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType2.xsd
deleted file mode 100644
index 3cd2a1f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType2.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:restriction base="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" minOccurs="1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:minLength value="1"></xsd:minLength>
- <xsd:maxLength value="10"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType3.xsd
deleted file mode 100644
index 5854775..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-BaseType3.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="ImpCT1">
- <xsd:sequence>
- <xsd:element
- name="elem1" type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd
deleted file mode 100644
index 042274a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="ImpCT1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd
deleted file mode 100644
index ded65be..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpCT1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd
deleted file mode 100644
index 222b5ab..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpCT1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-CT.xsd
deleted file mode 100644
index fee4d27..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-CT.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:element ref="MainElement1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="MainElement1" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-Group.xsd
deleted file mode 100644
index f497b01..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Unused/Main-Group.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:string"></xsd:element>
- <xsd:choice>
- <xsd:element name="localElem2" type="xsd:string"></xsd:element>
- <xsd:element ref="MainElement1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElement1" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-CT.xsd
deleted file mode 100644
index 0fe43f1..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-CT.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:element ref="ImpElem1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-Group.xsd
deleted file mode 100644
index 0f6482c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByElement/Used/Main-Group.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:string"></xsd:element>
- <xsd:choice>
- <xsd:element name="localElem2" type="xsd:string"></xsd:element>
- <xsd:element ref="ImpElem1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-CT.xsd
deleted file mode 100644
index 2455d7e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-CT.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:group ref="MainGroupDefinition1"></xsd:group>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-Group.xsd
deleted file mode 100644
index 4d74919..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Unused/Main-Group.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:group name="MainGroupDefinition2">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- <xsd:group ref="MainGroupDefinition1"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-CT.xsd
deleted file mode 100644
index b30fa5b..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-CT.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:group ref="ImpGr1"></xsd:group>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-Group.xsd
deleted file mode 100644
index 42baa6a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefByGroupDefinition/Used/Main-Group.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:group name="MainGroupDefinition2">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- <xsd:group ref="ImpGr1"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd
deleted file mode 100644
index 7156d9c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:attribute name="MainAttribute1" type="xsd:date"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index 9fc5272..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="xsd:unsignedByte"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-List.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-List.xsd
deleted file mode 100644
index 3b93173..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-List.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:list itemType="xsd:boolean">
- </xsd:list>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd
deleted file mode 100644
index e92aa5d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:attribute name="localAttribute1" type="xsd:short"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index 2af2a2d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:language"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index 3f86afc..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:double"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Restriction.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Restriction.xsd
deleted file mode 100644
index ab13f60..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Restriction.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:restriction base="xsd:time"></xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union1.xsd
deleted file mode 100644
index 5387e16..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union1.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union2.xsd
deleted file mode 100644
index 0e28d8a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union2.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union3.xsd
deleted file mode 100644
index 0e28d8a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Unused/Main-Union3.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd
deleted file mode 100644
index c578395..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:attribute name="MainAttribute1" type="ImpST1"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd
deleted file mode 100644
index d4e854e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="ImpST1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-List.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-List.xsd
deleted file mode 100644
index 0784650..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-List.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:list itemType="ImpST1">
- </xsd:list>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd
deleted file mode 100644
index e0fe8fd..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:attribute name="localAttribute1" type="ImpST1"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd
deleted file mode 100644
index 2db1603..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpST1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd
deleted file mode 100644
index ca53e64..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpST1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Restriction.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Restriction.xsd
deleted file mode 100644
index 18f7a15..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Restriction.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:restriction base="ImpST1"></xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union1.xsd
deleted file mode 100644
index dd904f4..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union1.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="ImpST1 xsd:boolean">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union2.xsd
deleted file mode 100644
index e8c0b31..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union2.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date ImpST1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union3.xsd
deleted file mode 100644
index 917f40b..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Chameleon-NoNamespace/RefBySimpleType/Used/Main-Union3.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="ImpST1">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/Import1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/Import1.xsd
deleted file mode 100644
index f69fcce..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/Import1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import">
-
- <xsd:complexType name="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="ImpGr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="ImpAttr1" type="tns:ImpST1"></xsd:attribute>
-
- <xsd:attributeGroup name="ImpAttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="ImpElem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="ImpST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="ImpST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="ImpCT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Unused/Main.xsd
deleted file mode 100644
index 7aabd1b..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Unused/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attribute ref="MainAttribute"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:attribute name="MainAttribute" type="xsd:string"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Used/Main.xsd
deleted file mode 100644
index cbf71c5..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttribute/Used/Main.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attribute ref="imp:ImpAttr1"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Unused/Main.xsd
deleted file mode 100644
index be67ad0..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Unused/Main.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attributeGroup ref="MainAttributeGroup1"></xsd:attributeGroup>
- </xsd:complexType>
-
- <xsd:attributeGroup name="MainAttributeGroup1">
- <xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Used/Main.xsd
deleted file mode 100644
index fb5cfe3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByAttributeGroup/Used/Main.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attributeGroup ref="imp:ImpAttrGr1"></xsd:attributeGroup>
- </xsd:complexType>
-
- <xsd:attributeGroup name="MainAttributeGroup1">
- <xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType1.xsd
deleted file mode 100644
index fced859..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType1.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:extension base="MainCT2"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType2.xsd
deleted file mode 100644
index 750fe91..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType2.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:restriction base="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" minOccurs="1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:minLength value="1"></xsd:minLength>
- <xsd:maxLength value="10"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType3.xsd
deleted file mode 100644
index fe4f0cd..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-BaseType3.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="MainCT1">
- <xsd:sequence>
- <xsd:element
- name="elem1" type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index b2eaf1c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="MainCT1"></xsd:element>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index 1a2df57..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="MainCT2"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index 568847d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="MainCT1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType1.xsd
deleted file mode 100644
index 078c87a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType1.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:extension base="imp:ImpCT1"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType2.xsd
deleted file mode 100644
index b52efd6..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType2.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCType1">
- <xsd:complexContent>
- <xsd:restriction base="imp:ImpCT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="21"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType3.xsd
deleted file mode 100644
index 2aeb249..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-BaseType3.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="imp:ImpCT1">
- <xsd:sequence>
- <xsd:element
- name="elem1" type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd
deleted file mode 100644
index 630d5de..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="imp:ImpCT1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd
deleted file mode 100644
index d3cc4e7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="imp:ImpCT1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd
deleted file mode 100644
index 223d3f2..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByComplexType/Used/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="imp:ImpCT1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-CT.xsd
deleted file mode 100644
index 3cef6b3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-CT.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:element ref="MainElement1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="MainElement1" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-Group.xsd
deleted file mode 100644
index 5d0f497..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Unused/Main-Group.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:string"></xsd:element>
- <xsd:choice>
- <xsd:element name="localElem2" type="xsd:string"></xsd:element>
- <xsd:element ref="MainElement1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElement1" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-CT.xsd
deleted file mode 100644
index 511617f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-CT.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:element ref="imp:ImpElem1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-Group.xsd
deleted file mode 100644
index 56355e9..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByElement/Used/Main-Group.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:string"></xsd:element>
- <xsd:choice>
- <xsd:element name="localElem2" type="xsd:string"></xsd:element>
- <xsd:element ref="imp:ImpElem1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-CT.xsd
deleted file mode 100644
index f4cda6a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-CT.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:group ref="MainGroupDefinition1"></xsd:group>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-Group.xsd
deleted file mode 100644
index a5e62c7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Unused/Main-Group.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:group name="MainGroupDefinition2">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- <xsd:group ref="MainGroupDefinition1"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-CT.xsd
deleted file mode 100644
index 1e6f7b8..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-CT.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:group ref="imp:ImpGr1"></xsd:group>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-Group.xsd
deleted file mode 100644
index 60868f5..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefByGroupDefinition/Used/Main-Group.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:group name="MainGroupDefinition2">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- <xsd:group ref="imp:ImpGr1"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd
deleted file mode 100644
index 5cd707e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:attribute name="MainAttribute1" type="xsd:date"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index 83d48ba..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="xsd:unsignedByte"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-List.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-List.xsd
deleted file mode 100644
index 64c6bf0..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-List.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:list itemType="xsd:boolean">
- </xsd:list>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd
deleted file mode 100644
index e967151..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:attribute name="localAttribute1" type="xsd:short"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index f7e38f2..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:language"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index 91b3bc3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:double"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Restriction.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Restriction.xsd
deleted file mode 100644
index 508426b..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Restriction.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:restriction base="xsd:time"></xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union1.xsd
deleted file mode 100644
index baddd70..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union1.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union2.xsd
deleted file mode 100644
index 19115a7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union2.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union3.xsd
deleted file mode 100644
index 19115a7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Unused/Main-Union3.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd
deleted file mode 100644
index bf910cb..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalAttributeType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:attribute name="MainAttribute1" type="imp:ImpST1"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd
deleted file mode 100644
index 3584a19..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:element name="MainElement1" type="imp:ImpST1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-List.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-List.xsd
deleted file mode 100644
index 07c402c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-List.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:list itemType="imp:ImpST1">
- </xsd:list>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd
deleted file mode 100644
index 9d87649..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalAttributeType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:attribute name="localAttribute1" type="imp:ImpST1"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd
deleted file mode 100644
index a4bc415..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="imp:ImpST1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd
deleted file mode 100644
index 803c34a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="imp:ImpST1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Restriction.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Restriction.xsd
deleted file mode 100644
index 6078414..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Restriction.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:restriction base="imp:ImpST1"></xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union1.xsd
deleted file mode 100644
index 0039299..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union1.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="imp:ImpST1 xsd:boolean">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union2.xsd
deleted file mode 100644
index 3feff40..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union2.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date imp:ImpST1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union3.xsd
deleted file mode 100644
index 27e2312..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/ImportsWithNamespace/RefBySimpleType/Used/Main-Union3.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:imp="http://www.example.org/Import"
- xmlns="http://www.example.org/Main">
-
- <xsd:import schemaLocation="../../Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="imp:ImpST1">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/Include1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/Include1.xsd
deleted file mode 100644
index 2a2eee2..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/Include1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:complexType name="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="ImpGr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="ImpAttr1" type="tns:ImpST1"></xsd:attribute>
-
- <xsd:attributeGroup name="ImpAttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="ImpElem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="ImpST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="ImpST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="ImpCT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Unused/Main.xsd
deleted file mode 100644
index 192925f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Unused/Main.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attribute ref="MainAttribute"></xsd:attribute>
- </xsd:complexType>
-
- <xsd:attribute name="MainAttribute" type="xsd:string"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Used/Main.xsd
deleted file mode 100644
index 3d16c33..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttribute/Used/Main.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attribute ref="ImpAttr1"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Unused/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Unused/Main.xsd
deleted file mode 100644
index e562da3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Unused/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attributeGroup ref="MainAttributeGroup1"></xsd:attributeGroup>
- </xsd:complexType>
-
- <xsd:attributeGroup name="MainAttributeGroup1">
- <xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Used/Main.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Used/Main.xsd
deleted file mode 100644
index 039d24a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByAttributeGroup/Used/Main.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
- <xsd:element name="MainElement1" type="MainCT"></xsd:element>
-
- <xsd:complexType name="MainCT">
- <xsd:attributeGroup ref="ImpAttrGr1"></xsd:attributeGroup>
- </xsd:complexType>
-
- <xsd:attributeGroup name="MainAttributeGroup1">
- <xsd:attribute name="atr1" type="xsd:string"></xsd:attribute>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType1.xsd
deleted file mode 100644
index 839a1aa..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:extension base="MainCT2"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType2.xsd
deleted file mode 100644
index 73e2825..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType2.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:restriction base="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" minOccurs="1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:minLength value="1"></xsd:minLength>
- <xsd:maxLength value="10"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType3.xsd
deleted file mode 100644
index 78769fb..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-BaseType3.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="MainCT1">
- <xsd:sequence>
- <xsd:element
- name="elem1" type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index a4a6167..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="MainCT1"></xsd:element>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index c20fe2e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="MainCT2"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT2"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index bd7fea7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="MainCT1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:complexType name="MainCT1"></xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType1.xsd
deleted file mode 100644
index 93e8423..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:extension base="ImpCT1"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType2.xsd
deleted file mode 100644
index 3cd2a1f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType2.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:complexContent>
- <xsd:restriction base="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" minOccurs="1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:minLength value="1"></xsd:minLength>
- <xsd:maxLength value="10"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType3.xsd
deleted file mode 100644
index 5854775..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-BaseType3.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="elem1">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="ImpCT1">
- <xsd:sequence>
- <xsd:element
- name="elem1" type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-GlobalElementType.xsd
deleted file mode 100644
index 042274a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="ImpCT1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType1.xsd
deleted file mode 100644
index ded65be..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpCT1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType2.xsd
deleted file mode 100644
index 222b5ab..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByComplexType/Used/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpCT1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-CT.xsd
deleted file mode 100644
index fee4d27..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-CT.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:element ref="MainElement1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="MainElement1" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-Group.xsd
deleted file mode 100644
index f497b01..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Unused/Main-Group.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:string"></xsd:element>
- <xsd:choice>
- <xsd:element name="localElem2" type="xsd:string"></xsd:element>
- <xsd:element ref="MainElement1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElement1" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-CT.xsd
deleted file mode 100644
index 0fe43f1..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-CT.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:element ref="ImpElem1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-Group.xsd
deleted file mode 100644
index 0f6482c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByElement/Used/Main-Group.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:string"></xsd:element>
- <xsd:choice>
- <xsd:element name="localElem2" type="xsd:string"></xsd:element>
- <xsd:element ref="ImpElem1"></xsd:element>
- </xsd:choice>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-CT.xsd
deleted file mode 100644
index 2455d7e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-CT.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:group ref="MainGroupDefinition1"></xsd:group>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-Group.xsd
deleted file mode 100644
index 4d74919..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Unused/Main-Group.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:group name="MainGroupDefinition2">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- <xsd:group ref="MainGroupDefinition1"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-CT.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-CT.xsd
deleted file mode 100644
index b30fa5b..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-CT.xsd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT">
- <xsd:sequence>
- <xsd:group ref="ImpGr1"></xsd:group>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-Group.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-Group.xsd
deleted file mode 100644
index 42baa6a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefByGroupDefinition/Used/Main-Group.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroupDefinition1">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:group name="MainGroupDefinition2">
- <xsd:sequence>
- <xsd:element name="grElem1" type="xsd:string"></xsd:element>
- <xsd:group ref="ImpGr1"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd
deleted file mode 100644
index 7156d9c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalAttributeType.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:attribute name="MainAttribute1" type="xsd:date"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalElementType.xsd
deleted file mode 100644
index 946e091..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="xsd:unsignedByte"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-List.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-List.xsd
deleted file mode 100644
index 3b93173..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-List.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:list itemType="xsd:boolean">
- </xsd:list>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd
deleted file mode 100644
index e92aa5d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalAttributeType1.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:attribute name="localAttribute1" type="xsd:short"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType1.xsd
deleted file mode 100644
index 2af2a2d..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:language"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType2.xsd
deleted file mode 100644
index 3f86afc..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="xsd:double"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Restriction.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Restriction.xsd
deleted file mode 100644
index ab13f60..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Restriction.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:restriction base="xsd:time"></xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union1.xsd
deleted file mode 100644
index 5387e16..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union1.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union2.xsd
deleted file mode 100644
index 0e28d8a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union2.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union3.xsd
deleted file mode 100644
index 0e28d8a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Unused/Main-Union3.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalAttributeType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalAttributeType.xsd
deleted file mode 100644
index c578395..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalAttributeType.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:attribute name="MainAttribute1" type="ImpST1"></xsd:attribute>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalElementType.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalElementType.xsd
deleted file mode 100644
index d4e854e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-GlobalElementType.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:element name="MainElement1" type="ImpST1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-List.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-List.xsd
deleted file mode 100644
index 0784650..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-List.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:list itemType="ImpST1">
- </xsd:list>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalAttributeType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalAttributeType1.xsd
deleted file mode 100644
index e0fe8fd..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalAttributeType1.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:attribute name="localAttribute1" type="ImpST1"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType1.xsd
deleted file mode 100644
index 2db1603..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType1.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:complexType name="MainCT1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpST1"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType2.xsd
deleted file mode 100644
index ca53e64..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-LocalElementType2.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:group name="MainGroup1">
- <xsd:sequence>
- <xsd:element name="localElem1" type="ImpST1"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Restriction.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Restriction.xsd
deleted file mode 100644
index 18f7a15..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Restriction.xsd
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:restriction base="ImpST1"></xsd:restriction>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union1.xsd
deleted file mode 100644
index dd904f4..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union1.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="ImpST1 xsd:boolean">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union2.xsd
deleted file mode 100644
index e8c0b31..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union2.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date ImpST1">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union3.xsd
deleted file mode 100644
index 917f40b..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/RefBySimpleType/Used/Main-Union3.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="../../Include1.xsd"></xsd:include>
-
- <xsd:simpleType name="MainST">
- <xsd:union memberTypes="xsd:boolean xsd:date">
- <xsd:simpleType>
- <xsd:restriction base="ImpST1">
- <xsd:maxLength value="5"></xsd:maxLength>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:union>
- </xsd:simpleType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include1.xsd
deleted file mode 100644
index 14d96d7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:complexType name="Inc1CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc1Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc1Attr1" type="tns:Inc1ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc1AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc1Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc1ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc1ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc1CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include2.xsd
deleted file mode 100644
index c6ad4a2..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include2.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="Include3.xsd"></xsd:include>
- <xsd:complexType name="Inc2CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc2Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc2Attr1" type="tns:Inc2ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc2AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc2Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc2ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc2ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc2CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include3.xsd
deleted file mode 100644
index 19e0207..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include3.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="Include4.xsd"></xsd:include>
- <xsd:complexType name="Inc3CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc3Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc3Attr1" type="tns:Inc3ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc3AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc3Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc3ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc3ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc3CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include4.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include4.xsd
deleted file mode 100644
index 7650984..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include4.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="Include5.xsd"></xsd:include>
-
- <xsd:complexType name="Inc4CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc4Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc4Attr1" type="tns:Inc4ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc4AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc4Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc4ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc4ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc4CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include5.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include5.xsd
deleted file mode 100644
index 5817abd..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include5.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="Include6.xsd"></xsd:include>
- <xsd:complexType name="Inc5CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc5Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc5Attr1" type="tns:Inc5ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc5AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc5Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc5ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc5ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc5CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include6.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include6.xsd
deleted file mode 100644
index 723033a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/Include6.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main" xmlns:Q1="http://www.example.org/Import">
-<!--
- <xsd:import schemaLocation="Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
- -->
- <xsd:include schemaLocation="Include2.xsd"></xsd:include>
- <xsd:include schemaLocation="Include5.xsd"></xsd:include>
-
- <xsd:complexType name="Inc6CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc6Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc6Attr1" type="tns:Inc6ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc6AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc6Elem1" type="xsd:string"></xsd:element>
-<!-- <xsd:element name="Inc6Elem1" type="Q1:ImpCT1"></xsd:element>-->
-
- <xsd:simpleType name="Inc6ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc6ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc6CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main001.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main001.xsd
deleted file mode 100644
index 8efd32c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main001.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <element name="MainElem1" type="string">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main002.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main002.xsd
deleted file mode 100644
index 5ae82a2..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Includes/circular/test/Main002.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
-
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <include schemaLocation="../Include5.xsd"></include>
-
- <include schemaLocation="../Include6.xsd"></include>
-
- <element name="MainElem1" type="string">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import001.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import001.xsd
deleted file mode 100644
index 6013144..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import001.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://wsdlTest/Import"
- xmlns:tns="http://wsdlTest/Import">
- <xsd:complexType name="ct01">
- <xsd:sequence>
- <xsd:element minOccurs="0" name="field1"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field2"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field3"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field4"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field5"
- type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="imp1Element" type="tns:ct01" />
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import002.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import002.xsd
deleted file mode 100644
index ed663ff..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import002.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://wsdlTest/Import">
- <xsd:complexType name="ct02">
- <xsd:sequence>
- <xsd:element minOccurs="0" name="field1"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field2"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field3"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field4"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field5"
- type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import003.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import003.xsd
deleted file mode 100644
index 292beda..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Import003.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://wsdlTest/Import" xmlns:tns="http://wsdlTest/Import">
- <xsd:complexType name="ct03">
- <xsd:sequence>
- <xsd:element minOccurs="0" name="field1"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field2"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field3"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field4"
- type="xsd:string">
- </xsd:element>
- <xsd:element minOccurs="0" name="field5"
- type="xsd:string">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="imp3Element">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="e1" type="tns:ct03"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Test.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Test.xsd
deleted file mode 100644
index f0a567f..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Simple/Test.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://wsdlTest"
- xmlns:imp="http://wsdlTest/Import" xmlns:tns="http://wsdlTest"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:import namespace="http://wsdlTest/Import"
- schemaLocation="Import001.xsd" />
- <xsd:import namespace="http://wsdlTest/Import"
- schemaLocation="Import002.xsd" />
- <xsd:import namespace="http://wsdlTest/Import"
- schemaLocation="Import003.xsd" />
- <xsd:element name="operation1">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="input1" nillable="true" type="xsd:int" />
- <xsd:element name="in" type="imp:ct03" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="operation1Response">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="output1" nillable="true" type="imp:ct02" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import1.xsd
deleted file mode 100644
index f69fcce..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import">
-
- <xsd:complexType name="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="ImpGr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="ImpAttr1" type="tns:ImpST1"></xsd:attribute>
-
- <xsd:attributeGroup name="ImpAttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="ImpElem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="ImpST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="ImpST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="ImpCT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import2.xsd
deleted file mode 100644
index 6dba770..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import2.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import">
-
- <xsd:complexType name="Imp2CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Imp2Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Imp2Attr1" type="tns:Imp2ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Imp2AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Imp2Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Imp2ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Imp2ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Imp2CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import3.xsd
deleted file mode 100644
index 7315d23..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import3.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import" xmlns:Q1="http://www.example.org/Import4">
-
- <xsd:import schemaLocation="Import4.xsd" namespace="http://www.example.org/Import4"></xsd:import>
- <xsd:complexType name="Imp3CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Imp3Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Imp3Attr1" type="tns:Imp3ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Imp3AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Imp3Elem1" type="Q1:Imp4CT1"></xsd:element>
-
- <xsd:simpleType name="Imp3ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Imp3ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Imp3CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import4.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import4.xsd
deleted file mode 100644
index 8451958..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import4.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import4"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import4" xmlns:Q1="http://www.example.org/Import">
-
- <xsd:import schemaLocation="Import3.xsd" namespace="http://www.example.org/Import"></xsd:import>
- <xsd:complexType name="Imp4CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Imp4Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Imp4Attr1" type="tns:Imp4ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Imp4AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Imp4Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Imp4ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Imp4ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Imp4CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-
-
- <xsd:element name="Imp4Elem2" type="Q1:Imp3CT2"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import5.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import5.xsd
deleted file mode 100644
index ae20e84..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import5.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import5" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import5" xmlns:Q1="http://www.example.org/Import6">
-
- <xsd:import schemaLocation="Import6.xsd" namespace="http://www.example.org/Import6"></xsd:import>
- <xsd:complexType name="Imp5CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Imp5Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Imp5Attr1" type="tns:Imp5ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Imp5AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Imp5Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Imp5ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Imp5ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Imp5CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-
-
- <xsd:element name="Imp5Elem2" type="Q1:Imp6CT1"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import6.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import6.xsd
deleted file mode 100644
index 9d15eaf..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Import6.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import6" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.example.org/Import6">
-
- <xsd:complexType name="Imp6CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Imp6Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Imp6Attr1" type="tns:Imp6ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Imp6AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Imp6Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Imp6ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Imp6ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Imp6CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-
-
- <xsd:element name="Imp6Elem2" type="xsd:string"></xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include1.xsd
deleted file mode 100644
index 14d96d7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:complexType name="Inc1CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc1Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc1Attr1" type="tns:Inc1ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc1AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc1Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc1ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc1ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc1CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include2.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include2.xsd
deleted file mode 100644
index c6ad4a2..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include2.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="Include3.xsd"></xsd:include>
- <xsd:complexType name="Inc2CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc2Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc2Attr1" type="tns:Inc2ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc2AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc2Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc2ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc2ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc2CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include3.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include3.xsd
deleted file mode 100644
index 19e0207..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include3.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:include schemaLocation="Include4.xsd"></xsd:include>
- <xsd:complexType name="Inc3CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc3Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc3Attr1" type="tns:Inc3ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc3AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc3Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc3ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc3ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc3CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include4.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include4.xsd
deleted file mode 100644
index b459b16..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include4.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:complexType name="Inc4CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc4Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc4Attr1" type="tns:Inc4ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc4AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc4Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc4ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc4ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc4CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include5.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include5.xsd
deleted file mode 100644
index 382c365..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include5.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:complexType name="Inc5CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc5Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc5Attr1" type="tns:Inc5ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc5AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc5Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc5ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc5ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc5CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include6.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include6.xsd
deleted file mode 100644
index 2b6d4f1..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/Include6.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main" xmlns:Q1="http://www.example.org/Import">
-
- <xsd:import schemaLocation="Import1.xsd" namespace="http://www.example.org/Import"></xsd:import>
- <xsd:complexType name="Inc6CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc6Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc6Attr1" type="tns:Inc6ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc6AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc6Elem1" type="Q1:ImpCT1"></xsd:element>
-
- <xsd:simpleType name="Inc6ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc6ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc6CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main001.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main001.xsd
deleted file mode 100644
index 555a9d5..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main001.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified">
- <include schemaLocation="../Include1.xsd"></include>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main002.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main002.xsd
deleted file mode 100644
index da2a8b3..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main002.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- xmlns:imp="http://www.example.org/Import"
- elementFormDefault="qualified">
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main003.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main003.xsd
deleted file mode 100644
index 61dd369..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main003.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- xmlns:imp="http://www.example.org/Import"
- elementFormDefault="qualified">
- <include schemaLocation="../Include1.xsd"></include>
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main004.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main004.xsd
deleted file mode 100644
index b79bcea..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main004.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- xmlns:imp="http://www.example.org/Import"
- elementFormDefault="qualified">
- <include schemaLocation="../Include1.xsd"></include>
- <import schemaLocation="../Import3.xsd" namespace="http://www.example.org/Import"></import>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main005.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main005.xsd
deleted file mode 100644
index 2ceae17..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main005.xsd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- xmlns:imp="http://www.example.org/Import"
- xmlns:imp4="http://www.example.org/Import4"
- elementFormDefault="qualified">
- <include schemaLocation="../Include1.xsd"></include>
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
- <import schemaLocation="../Import2.xsd" namespace="http://www.example.org/Import"></import>
- <import schemaLocation="../Import3.xsd" namespace="http://www.example.org/Import"></import>
- <import schemaLocation="../Import4.xsd" namespace="http://www.example.org/Import4"></import>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main006.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main006.xsd
deleted file mode 100644
index 229d338..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main006.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
-
- <include schemaLocation="../Include1.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main007.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main007.xsd
deleted file mode 100644
index f22a687..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main007.xsd
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
-
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main008.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main008.xsd
deleted file mode 100644
index 8589c06..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main008.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
-
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <attribute name="Main8Attribute" type="tns:Inc3ST1"></attribute>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009.xsd
deleted file mode 100644
index d186a4a..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <import schemaLocation="../Import1.xsd" namespace="http://www.example.org/Import"></import>
-
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc3CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009a.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009a.xsd
deleted file mode 100644
index 1cb091c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009a.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009b.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009b.xsd
deleted file mode 100644
index 68abf01..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009b.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009c.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009c.xsd
deleted file mode 100644
index 450c225..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009c.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <element name="MainElem1" type="string">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009d.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009d.xsd
deleted file mode 100644
index 3c9c328..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009d.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <element name="MainElem1" type="string">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009e.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009e.xsd
deleted file mode 100644
index 1a3ecc0..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009e.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009f.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009f.xsd
deleted file mode 100644
index 32edc58..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009f.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <include schemaLocation="../A.xsd"></include>
-
- <include schemaLocation="../Include5.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <element name="MainElem1" type="string">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009g.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009g.xsd
deleted file mode 100644
index 631fa7e..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009g.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc3CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009h.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009h.xsd
deleted file mode 100644
index b9497d8..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/Unused/test/Main009h.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns="http://www.example.org/Main"
- elementFormDefault="qualified" xmlns:p="http://www.example.org/Import">
- <include schemaLocation="../Include1.xsd"></include>
-
- <include schemaLocation="../Include2.xsd"></include>
-
- <include schemaLocation="../Include3.xsd"></include>
-
- <include schemaLocation="../Include4.xsd"></include>
-
- <include schemaLocation="../Include5.xsd"></include>
-
- <element name="MainElem1" type="tns:Inc2CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <complexType name="Main9CT1">
- <complexContent>
- <extension base="tns:Inc4CT1"></extension>
- </complexContent>
- </complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Import1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Import1.xsd
deleted file mode 100644
index f69fcce..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Import1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Import"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Import">
-
- <xsd:complexType name="ImpCT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="ImpGr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="ImpAttr1" type="tns:ImpST1"></xsd:attribute>
-
- <xsd:attributeGroup name="ImpAttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="ImpElem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="ImpST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="ImpST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="ImpCT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Include1.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Include1.xsd
deleted file mode 100644
index 14d96d7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/Include1.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema elementFormDefault="qualified"
- targetNamespace="http://www.example.org/Main"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main">
-
- <xsd:complexType name="Inc1CT1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string" maxOccurs="25"></xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:group name="Inc1Gr1">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string"></xsd:element>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:attribute name="Inc1Attr1" type="tns:Inc1ST1"></xsd:attribute>
-
- <xsd:attributeGroup name="Inc1AttrGr1">
- <xsd:attribute name="at1" type="xsd:string"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:element name="Inc1Elem1" type="xsd:string"></xsd:element>
-
- <xsd:simpleType name="Inc1ST1">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="Inc1ST2">
- <xsd:restriction base="xsd:string"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="Inc1CT2">
- <xsd:attribute name="attr1" type="xsd:string"></xsd:attribute>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main001.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main001.xsd
deleted file mode 100644
index 9b66b1c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main001.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns01="http://www.example.org/Main"
- xmlns:tns02="http://www.example.org/Main"
- xmlns:tns03="http://www.example.org/Main"
- xmlns:tns04="http://www.example.org/Main"
- xmlns:tns05="http://www.example.org/Main"
- xmlns:tns06="http://www.example.org/Main"
- xmlns:tns07="http://www.example.org/Main"
- xmlns:tns08="http://www.example.org/Main"
- xmlns:tns09="http://www.example.org/Main"
- xmlns:tns10="http://www.example.org/Main"
- xmlns:tns11="http://www.example.org/Main"
- xmlns:tns12="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import"
- elementFormDefault="qualified">
-
- <element name="MainElem001" type="string"></element>
-
- <complexType name="MainCT001">
- <sequence>
- <element name="CT001Elem001" type="string"></element>
- <element ref="tns01:MainElem001"></element>
- <any></any>
- </sequence>
- </complexType>
-
- <complexType name="MainCT002">
- <complexContent>
- <extension base="tns02:MainCT001"></extension>
- </complexContent>
- </complexType>
-
- <complexType name="MainCT003">
- <complexContent>
- <restriction base="tns03:MainCT001"></restriction>
- </complexContent>
- </complexType>
-
- <complexType name="MainCT004">
- <simpleContent>
- <extension base="string">
- <annotation>
- <appinfo></appinfo>
- </annotation>
- <attribute name="attr1" type="short"></attribute>
- <attributeGroup ref="tns04:MainAttrGr001"></attributeGroup>
- <anyAttribute></anyAttribute>
- </extension>
- </simpleContent>
- </complexType>
-
- <simpleType name="MainST001">
- <restriction base="string">
- <enumeration value="enum1"></enumeration>
- </restriction>
- </simpleType>
-
- <simpleType name="MainST002">
- <restriction base="tns05:MainST001"></restriction>
- </simpleType>
-
- <simpleType name="MainST003">
- <list itemType="tns06:MainST001"></list>
- </simpleType>
-
- <simpleType name="MainST004">
- <list>
- <simpleType>
- <restriction base="tns07:MainST001"></restriction>
- </simpleType>
- </list>
- </simpleType>
-
-
- <simpleType name="MainST005">
- <union memberTypes="tns08:MainST001 tns09:MainST002"></union>
- </simpleType>
-
- <attribute name="MainAttr001" type="string"></attribute>
-
- <attribute name="MainAttr002" type="string"></attribute>
-
- <attributeGroup name="MainAttrGr001">
- <attribute ref="tns10:MainAttr001"></attribute>
- </attributeGroup>
-
- <attributeGroup name="MainAttrGr002"></attributeGroup>
-
- <group name="MainGroup001">
- <sequence>
- <group ref="tns11:MainGroup002"></group>
- </sequence>
- </group>
-
- <element name="MainElem002" type="string" substitutionGroup="tns12:MainElem001"></element>
-
- <group name="MainGroup002">
- <sequence>
- <element name="e1" type="string">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
- </sequence>
- </group>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main002.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main002.xsd
deleted file mode 100644
index ea038ca..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main002.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Main"
- xmlns:tns01="http://www.example.org/Main"
- xmlns:tns02="http://www.example.org/Main"
- xmlns:tns03="http://www.example.org/Main"
- xmlns:tns04="http://www.example.org/Main"
- xmlns:tns05="http://www.example.org/Main"
- elementFormDefault="qualified"
- xmlns:p="http://www.example.org/Import">
-
- <include schemaLocation="../Include1.xsd"></include>
-
- <element name="MainElem001" type="tns01:Inc1CT1">
- <annotation>
- <appinfo>
- <p:ImpElem1></p:ImpElem1>
- </appinfo>
- </annotation>
- </element>
-
- <simpleType name="MainST001">
- <restriction base="string"></restriction>
- </simpleType>
-
- <simpleType name="MainST002">
- <restriction base="tns02:MainST001"></restriction>
- </simpleType>
-
- <simpleType name="MainST005">
- <union memberTypes="tns03:MainST001
- tns04:MainST002
- string
- integer "></union>
- </simpleType>
-
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main003.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main003.xsd
deleted file mode 100644
index c88b034..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main003.xsd
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- xmlns:tns01="http://www.example.org/Main"
- xmlns:tns02="http://www.example.org/Main"
- xmlns:tns03="http://www.example.org/Main"
- xmlns:tns04="http://www.example.org/Main"
- xmlns:tns05="http://www.example.org/Main"
- xmlns:tns06="http://www.example.org/Main"
- xmlns:tns07="http://www.example.org/Main"
- xmlns:tns08="http://www.example.org/Main"
- xmlns:tns09="http://www.example.org/Main"
- xmlns:tns10="http://www.example.org/Main"
- xmlns:tns11="http://www.example.org/Main"
- xmlns:tns12="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import" elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:element name="MainElem001" type="xsd:string"></xsd:element>
-
- <xsd:complexType name="MainCT001">
- <xsd:sequence>
- <xsd:element name="CT001Elem001" type="xsd:string"></xsd:element>
- <xsd:element ref="tns01:MainElem001"></xsd:element>
- <xsd:any></xsd:any>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT002">
- <xsd:complexContent>
- <xsd:extension base="tns02:MainCT001"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT003">
- <xsd:complexContent>
- <xsd:restriction base="tns03:MainCT001"></xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT004">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:annotation>
- <xsd:appinfo></xsd:appinfo>
- </xsd:annotation>
- <xsd:attribute name="attr1" type="xsd:short"></xsd:attribute>
- <xsd:attributeGroup ref="tns04:MainAttrGr001"></xsd:attributeGroup>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:simpleType name="MainST001">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enum1"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST002">
- <xsd:restriction base="tns05:MainST001"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST003">
- <xsd:list itemType="tns06:MainST001"></xsd:list>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST004">
- <xsd:list>
- <xsd:simpleType>
- <xsd:restriction base="tns07:MainST001"></xsd:restriction>
- </xsd:simpleType>
- </xsd:list>
- </xsd:simpleType>
-
-
- <xsd:simpleType name="MainST005">
- <xsd:union memberTypes="tns08:MainST001 tns09:MainST002"></xsd:union>
- </xsd:simpleType>
-
- <xsd:attribute name="MainAttr001" type="xsd:string"></xsd:attribute>
-
- <xsd:attribute name="MainAttr002" type="xsd:string"></xsd:attribute>
-
- <xsd:attributeGroup name="MainAttrGr001">
- <xsd:attribute ref="tns10:MainAttr001"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:attributeGroup name="MainAttrGr002"></xsd:attributeGroup>
-
- <xsd:group name="MainGroup001">
- <xsd:sequence>
- <xsd:group ref="tns11:MainGroup002"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElem002" type="xsd:string" substitutionGroup="tns12:MainElem001"></xsd:element>
-
- <xsd:group name="MainGroup002">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <p:ImpElem1></p:ImpElem1>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main004.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main004.xsd
deleted file mode 100644
index 7dcf0f7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main004.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- xmlns:tns01="http://www.example.org/Main"
- xmlns:tns02="http://www.example.org/Main"
- xmlns:tns03="http://www.example.org/Main"
- xmlns:tns04="http://www.example.org/Main"
- xmlns:tns05="http://www.example.org/Main"
- xmlns:tns06="http://www.example.org/Main"
- xmlns:tns07="http://www.example.org/Main"
- xmlns:tns08="http://www.example.org/Main"
- xmlns:tns09="http://www.example.org/Main"
- xmlns:tns10="http://www.example.org/Main"
- xmlns:tns11="http://www.example.org/Main"
- xmlns:tns12="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import" elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:element name="MainElem001" type="xsd:string"></xsd:element>
-
- <xsd:complexType name="MainCT001">
- <xsd:sequence>
- <xsd:element name="CT001Elem001" type="xsd:string"></xsd:element>
- <xsd:element ref="tns01:MainElem001"></xsd:element>
- <xsd:any></xsd:any>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT002">
- <xsd:complexContent>
- <xsd:extension base="tns01:MainCT001"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT003">
- <xsd:complexContent>
- <xsd:restriction base="tns01:MainCT001"></xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT004">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:annotation>
- <xsd:appinfo></xsd:appinfo>
- </xsd:annotation>
- <xsd:attribute name="attr1" type="xsd:short"></xsd:attribute>
- <xsd:attributeGroup ref="tns01:MainAttrGr001"></xsd:attributeGroup>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:simpleType name="MainST001">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enum1"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST002">
- <xsd:restriction base="tns01:MainST001"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST003">
- <xsd:list itemType="tns01:MainST001"></xsd:list>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST004">
- <xsd:list>
- <xsd:simpleType>
- <xsd:restriction base="tns01:MainST001"></xsd:restriction>
- </xsd:simpleType>
- </xsd:list>
- </xsd:simpleType>
-
-
- <xsd:simpleType name="MainST005">
- <xsd:union memberTypes="tns01:MainST001 tns01:MainST002"></xsd:union>
- </xsd:simpleType>
-
- <xsd:attribute name="MainAttr001" type="xsd:string"></xsd:attribute>
-
- <xsd:attribute name="MainAttr002" type="xsd:string"></xsd:attribute>
-
- <xsd:attributeGroup name="MainAttrGr001">
- <xsd:attribute ref="tns01:MainAttr001"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:attributeGroup name="MainAttrGr002"></xsd:attributeGroup>
-
- <xsd:group name="MainGroup001">
- <xsd:sequence>
- <xsd:group ref="tns01:MainGroup002"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElem002" type="xsd:string" substitutionGroup="tns01:MainElem001"></xsd:element>
-
- <xsd:group name="MainGroup002">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <p:ImpElem1></p:ImpElem1>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main005.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main005.xsd
deleted file mode 100644
index 971393c..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main005.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- xmlns:tns01="http://www.example.org/Main"
- xmlns:tns02="http://www.example.org/Main"
- xmlns:tns03="http://www.example.org/Main"
- xmlns:tns04="http://www.example.org/Main"
- xmlns:tns05="http://www.example.org/Main"
- xmlns:tns06="http://www.example.org/Main"
- xmlns:tns07="http://www.example.org/Main"
- xmlns:tns08="http://www.example.org/Main"
- xmlns:tns09="http://www.example.org/Main"
- xmlns:tns10="http://www.example.org/Main"
- xmlns:tns11="http://www.example.org/Main"
- xmlns:tns12="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import" elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://www.example.org/Main">
-
- <xsd:element name="MainElem001" type="xsd:string"></xsd:element>
-
- <xsd:complexType name="MainCT001">
- <xsd:sequence>
- <xsd:element name="CT001Elem001" type="xsd:string"></xsd:element>
- <xsd:element ref="MainElem001"></xsd:element>
- <xsd:any></xsd:any>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT002">
- <xsd:complexContent>
- <xsd:extension base="MainCT001"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT003">
- <xsd:complexContent>
- <xsd:restriction base="MainCT001"></xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT004">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:annotation>
- <xsd:appinfo></xsd:appinfo>
- </xsd:annotation>
- <xsd:attribute name="attr1" type="xsd:short"></xsd:attribute>
- <xsd:attributeGroup ref="MainAttrGr001"></xsd:attributeGroup>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:simpleType name="MainST001">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enum1"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST002">
- <xsd:restriction base="MainST001"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST003">
- <xsd:list itemType="MainST001"></xsd:list>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST004">
- <xsd:list>
- <xsd:simpleType>
- <xsd:restriction base="MainST001"></xsd:restriction>
- </xsd:simpleType>
- </xsd:list>
- </xsd:simpleType>
-
-
- <xsd:simpleType name="MainST005">
- <xsd:union memberTypes="MainST001 MainST002"></xsd:union>
- </xsd:simpleType>
-
- <xsd:attribute name="MainAttr001" type="xsd:string"></xsd:attribute>
-
- <xsd:attribute name="MainAttr002" type="xsd:string"></xsd:attribute>
-
- <xsd:attributeGroup name="MainAttrGr001">
- <xsd:attribute ref="MainAttr001"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:attributeGroup name="MainAttrGr002"></xsd:attributeGroup>
-
- <xsd:group name="MainGroup001">
- <xsd:sequence>
- <xsd:group ref="MainGroup002"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElem002" type="xsd:string" substitutionGroup="MainElem001"></xsd:element>
-
- <xsd:group name="MainGroup002">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <p:ImpElem1></p:ImpElem1>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main006.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main006.xsd
deleted file mode 100644
index 3dbb2e7..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main006.xsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- xmlns:tns01="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import" elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:element name="MainElem001" type="xsd:string"></xsd:element>
-
- <xsd:complexType name="MainCT001">
- <xsd:sequence>
- <xsd:element name="CT001Elem001" type="xsd:string"></xsd:element>
- <xsd:element ref="MainElem001"></xsd:element>
- <xsd:any></xsd:any>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT002">
- <xsd:complexContent>
- <xsd:extension base="MainCT001"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT003">
- <xsd:complexContent>
- <xsd:restriction base="MainCT001"></xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT004">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:annotation>
- <xsd:appinfo></xsd:appinfo>
- </xsd:annotation>
- <xsd:attribute name="attr1" type="xsd:short"></xsd:attribute>
- <xsd:attributeGroup ref="MainAttrGr001"></xsd:attributeGroup>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:simpleType name="MainST001">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enum1"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST002">
- <xsd:restriction base="MainST001"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST003">
- <xsd:list itemType="MainST001"></xsd:list>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST004">
- <xsd:list>
- <xsd:simpleType>
- <xsd:restriction base="MainST001"></xsd:restriction>
- </xsd:simpleType>
- </xsd:list>
- </xsd:simpleType>
-
-
- <xsd:simpleType name="MainST005">
- <xsd:union memberTypes="MainST001 MainST002"></xsd:union>
- </xsd:simpleType>
-
- <xsd:attribute name="MainAttr001" type="xsd:string"></xsd:attribute>
-
- <xsd:attribute name="MainAttr002" type="xsd:string"></xsd:attribute>
-
- <xsd:attributeGroup name="MainAttrGr001">
- <xsd:attribute ref="MainAttr001"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:attributeGroup name="MainAttrGr002"></xsd:attributeGroup>
-
- <xsd:group name="MainGroup001">
- <xsd:sequence>
- <xsd:group ref="MainGroup002"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElem002" type="xsd:string" substitutionGroup="MainElem001"></xsd:element>
-
- <xsd:group name="MainGroup002">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <p:ImpElem1></p:ImpElem1>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main007.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main007.xsd
deleted file mode 100644
index ae3accf..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main007.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import" elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main"
- xmlns="http://Unused">
-
- <xsd:element name="MainElem001" type="xsd:string"></xsd:element>
-
- <xsd:complexType name="MainCT001">
- <xsd:sequence>
- <xsd:element name="CT001Elem001" type="xsd:string"></xsd:element>
- <xsd:element ref="tns:MainElem001"></xsd:element>
- <xsd:any></xsd:any>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT002">
- <xsd:complexContent>
- <xsd:extension base="tns:MainCT001"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT003">
- <xsd:complexContent>
- <xsd:restriction base="tns:MainCT001"></xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT004">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:annotation>
- <xsd:appinfo></xsd:appinfo>
- </xsd:annotation>
- <xsd:attribute name="attr1" type="xsd:short"></xsd:attribute>
- <xsd:attributeGroup ref="tns:MainAttrGr001"></xsd:attributeGroup>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:simpleType name="MainST001">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enum1"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST002">
- <xsd:restriction base="tns:MainST001"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST003">
- <xsd:list itemType="tns:MainST001"></xsd:list>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST004">
- <xsd:list>
- <xsd:simpleType>
- <xsd:restriction base="tns:MainST001"></xsd:restriction>
- </xsd:simpleType>
- </xsd:list>
- </xsd:simpleType>
-
-
- <xsd:simpleType name="MainST005">
- <xsd:union memberTypes="tns:MainST001 tns:MainST002"></xsd:union>
- </xsd:simpleType>
-
- <xsd:attribute name="MainAttr001" type="xsd:string"></xsd:attribute>
-
- <xsd:attribute name="MainAttr002" type="xsd:string"></xsd:attribute>
-
- <xsd:attributeGroup name="MainAttrGr001">
- <xsd:attribute ref="tns:MainAttr001"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:attributeGroup name="MainAttrGr002"></xsd:attributeGroup>
-
- <xsd:group name="MainGroup001">
- <xsd:sequence>
- <xsd:group ref="tns:MainGroup002"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElem002" type="xsd:string" substitutionGroup="tns:MainElem001"></xsd:element>
-
- <xsd:group name="MainGroup002">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <p:ImpElem1></p:ImpElem1>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main008.xsd b/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main008.xsd
deleted file mode 100644
index 9a59944..0000000
--- a/tests/org.eclipse.wst.xsd.ui.tests/testresources/XSD/xmlnsCleanup/test/Main008.xsd
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.example.org/Main"
- xmlns:p="http://www.example.org/Import" elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.example.org/Main"
- xmlns="http://Used">
-
- <xsd:element name="MainElem001" type="xsd:string"></xsd:element>
-
- <xsd:complexType name="MainCT001">
- <xsd:sequence>
- <xsd:element name="CT001Elem001" type="xsd:string"></xsd:element>
- <xsd:element ref="tns:MainElem001"></xsd:element>
- <xsd:any></xsd:any>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT002">
- <xsd:complexContent>
- <xsd:extension base="tns:MainCT001"></xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT003">
- <xsd:complexContent>
- <xsd:restriction base="tns:MainCT001"></xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="MainCT004">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:annotation>
- <xsd:appinfo></xsd:appinfo>
- </xsd:annotation>
- <xsd:attribute name="attr1" type="xsd:short"></xsd:attribute>
- <xsd:attributeGroup ref="tns:MainAttrGr001"></xsd:attributeGroup>
- <xsd:anyAttribute></xsd:anyAttribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
-
- <xsd:simpleType name="MainST001">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="enum1"></xsd:enumeration>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST002">
- <xsd:restriction base="tns:MainST001"></xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST003">
- <xsd:list itemType="tns:MainST001"></xsd:list>
- </xsd:simpleType>
-
- <xsd:simpleType name="MainST004">
- <xsd:list>
- <xsd:simpleType>
- <xsd:restriction base="tns:MainST001"></xsd:restriction>
- </xsd:simpleType>
- </xsd:list>
- </xsd:simpleType>
-
-
- <xsd:simpleType name="MainST005">
- <xsd:union memberTypes="tns:MainST001 tns:MainST002"></xsd:union>
- </xsd:simpleType>
-
- <xsd:attribute name="MainAttr001" type="xsd:string"></xsd:attribute>
-
- <xsd:attribute name="MainAttr002" type="xsd:string"></xsd:attribute>
-
- <xsd:attributeGroup name="MainAttrGr001">
- <xsd:attribute ref="tns:MainAttr001"></xsd:attribute>
- </xsd:attributeGroup>
-
- <xsd:attributeGroup name="MainAttrGr002"></xsd:attributeGroup>
-
- <xsd:group name="MainGroup001">
- <xsd:sequence>
- <xsd:group ref="tns:MainGroup002"></xsd:group>
- </xsd:sequence>
- </xsd:group>
-
- <xsd:element name="MainElem002" type="xsd:string" substitutionGroup="tns:MainElem001"></xsd:element>
-
- <xsd:group name="MainGroup002">
- <xsd:sequence>
- <xsd:element name="e1" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <ImpElem1></ImpElem1>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.classpath b/tests/org.eclipse.wst.xsd.validation.tests/.classpath
deleted file mode 100644
index 76c6027..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.classpath
+++ /dev/null
@@ -1,11 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
deleted file mode 100644
index a037531..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-validatexsdtests.jar
-temp.folder
-javaCompiler.validatexsdtests.jar.args
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.project b/tests/org.eclipse.wst.xsd.validation.tests/.project
deleted file mode 100644
index d48cd47..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xsd.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.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/tests/org.eclipse.wst.xsd.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.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 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=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-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=error
-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=error
-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=ignore
-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.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/tests/org.eclipse.wst.xsd.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.xsd.validation.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-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.xsd.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 30faa1c..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests
-Bundle-Version: 1.0.501.qualifier
-Bundle-ClassPath: validatexsdtests.jar
-Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.junit;bundle-version="3.8.0",
- org.eclipse.wst.xml.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.xsd.core,
- org.eclipse.wst.validation,
- org.eclipse.wst.common.uriresolver
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.wst.xsd.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xsd.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xsd.validation.tests.internal;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/about.html b/tests/org.eclipse.wst.xsd.validation.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/build.properties b/tests/org.eclipse.wst.xsd.validation.tests/build.properties
deleted file mode 100644
index c6cfeaf..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-###############################################################################
-bin.includes = validatexsdtests.jar,\
- test.xml,\
- testresources/,\
- META-INF/,\
- about.html,\
- plugin.properties
-source.validatexsdtests.jar = src/
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties b/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
deleted file mode 100644
index d6c0ab3..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.wst.xsd.validation.tests
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = XSD Validation Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java
deleted file mode 100644
index 4983d79..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfigurationTest.java
+++ /dev/null
@@ -1,118 +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.xsd.core.internal.validation;
-
-import junit.framework.TestCase;
-
-/**
- * Test the XSDValidationConfiguration class.
- */
-public class XSDValidationConfigurationTest extends TestCase
-{
- XSDValidationConfiguration configuration;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception
- {
- super.setUp();
- configuration = new XSDValidationConfiguration();
- }
-
-
- protected void tearDown() throws Exception
- {
- configuration = null;
- super.tearDown();
- }
-
-
- /**
- * Test the default setting of the HONOUR_ALL_SCHEMA_LOCATIONS feature.
- */
- public void testSetHonourAllSchemaLocationsFeatureDefault()
- {
- try
- {
- assertFalse("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set by default to false.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set read the HONOUR_ALL_SCHEMA_LOCATIONS feature: " + e);
- }
- }
-
- /**
- * Test setting the HONOUR_ALL_SCHEMA_LOCATIONS feature to true.
- */
- public void testSetHonourAllSchemaLocationsFeatureTrue()
- {
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- assertTrue("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set to true.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set HONOUR_ALL_SCHEMA_LOCATIONS to true: " + e);
- }
- }
-
- /**
- * Test setting the HONOUR_ALL_SCHEMA_LOCATIONS feature to false.
- */
- public void testSetHonourAllSchemaLocationsFeatureFalse()
- {
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, false);
- assertFalse("The HONOUR_ALL_SCHEMA_LOCATIONS feature is not set to false.", configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS));
- }
- catch(Exception e)
- {
- fail("Unable to set HONOUR_ALL_SCHEMA_LOCATIONS 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.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java
deleted file mode 100644
index 668b419..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorTest.java
+++ /dev/null
@@ -1,161 +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.xsd.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.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin;
-
-/**
- * A test class for the Validator class.
- */
-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 "s4s-elt-character".
- ValidationMessage validationMessage2 = new ValidationMessage("", 1, 1, "", "s4s-elt-character", null);
- Message message2 = new Message();
- validator.addInfoToMessage(validationMessage2, message2);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key s4s-elt-character. COLUMN_NUMBER_ATTRIBUTE = " + message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message2.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not TEXT. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "TEXT", message2.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not an empty string for a ValidationMessage with the key s4s-elt-character. 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 "src-resolve".
- ValidationMessage validationMessage3 = new ValidationMessage("'MyName'", 1, 1, "", "src-resolve", null);
- Message message3 = new Message();
- validator.addInfoToMessage(validationMessage3, message3);
- assertEquals("COLUMN_NUMBER_ATTRIBUTE was correctly set to 1 for a ValidationMessage with the key src-resolve. COLUMN_NUMBER_ATTRIBUTE = " + message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE), new Integer(1), message3.getAttribute(COLUMN_NUMBER_ATTRIBUTE));
- assertEquals("SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE was not VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE. SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = " + message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE), "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE", message3.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE));
- assertEquals("SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE was not set to MyName for a ValidationMessage with the key src-resolve. 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 = XSDValidationTestsPlugin.getInstallURL();
- String uri = "file:///" + PLUGIN_ABSOLUTE_PATH + "testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd";
- ValidationReport report1 = validator.validate(uri, null, new NestedValidatorContext());
- ValidationReport report2 = null;
- InputStream is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, new NestedValidatorContext());
- }
- 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.xsd";
- report1 = validator.validate(uri, null, new NestedValidatorContext());
- report2 = null;
- is = null;
- try
- {
- is = new URL(uri).openStream();
- report2 = validator.validate(uri, is, new NestedValidatorContext());
- }
- 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);
- }
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java
deleted file mode 100644
index ada95f5..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/ValidatorWrapper.java
+++ /dev/null
@@ -1,28 +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.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-
-/**
- * A wrapper class to allow for testing the Validator class.
- */
-public class ValidatorWrapper extends Validator
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage)
- */
- public void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
- {
- super.addInfoToMessage(validationMessage, message);
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java
deleted file mode 100644
index dc6eb1a..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperTest.java
+++ /dev/null
@@ -1,82 +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.xsd.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test case to test the XSDMessageInfoHelper class.
- */
-public class XSDMessageInfoHelperTest extends TestCase
-{
- private XSDMessageInfoHelperWrapper helper = new XSDMessageInfoHelperWrapper();
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(XSDMessageInfoHelperTest.class);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", ""} 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]);
- assertEquals("The nameOrValue returned was not an empty string.", "", messageInfo[1]);
- }
-
- /**
- * Test that the createMessageInfo method returns {"", ""} when
- * given a non-existant key an null message arguments.
- */
- public void testNullKeyAndMessageArguments()
- {
- String[] messageInfo = helper.createMessageInfo(null, null);
- assertEquals("The selection strategy returned was not an empty string.", "", messageInfo[0]);
- assertEquals("The nameOrValue returned was not an empty string.", "", messageInfo[1]);
- }
-
- /**
- * Test the method getFirstStringBetweenSingleQuotes. There are a few tests:
- * 1. Test that a simple string with single quotes 'name' returns name.
- * 2. Test that a string with no single quotes returns null.
- * 3. Test that a string with a single single quote 'name returns null.
- * 4. Test that a string with 3 single quotes 'name'name2' returns name.
- */
- public void testGetFirstStringBetweenSingleQuotes()
- {
- // 1. Test that a simple string with single quotes 'name' returns name.
- String result = helper.getFirstStringBetweenSingleQuotes("'name'");
- assertEquals("The returned string was not \"name\" for the string \"'name'\".", "name", result);
-
- // 2. Test that a string with no single quotes returns null.
- result = helper.getFirstStringBetweenSingleQuotes("name");
- assertNull("The returned string was not null for the string \"name\" with no single quotes.", result);
-
- // 3. Test that a string with a single single quote 'name returns null.
- result = helper.getFirstStringBetweenSingleQuotes("'name");
- assertNull("The returned string was not null for the string \"'name\" with one single quote.", result);
-
- // 4. Test that a string with 3 single quotes 'name'name2' returns name.
- result = helper.getFirstStringBetweenSingleQuotes("'name'name2'");
- assertEquals("The returned string was not \"name\" for the string \"'name'name2'\" with 3 single quotes.", "name", result);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java
deleted file mode 100644
index 0442964..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelperWrapper.java
+++ /dev/null
@@ -1,25 +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.xsd.core.internal.validation.eclipse;
-
-/**
- * A wrapper class for the XSDMessageInfoHelper class for testing.
- */
-public class XSDMessageInfoHelperWrapper extends XSDMessageInfoHelper
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDMessageInfoHelper#getFirstStringBetweenSingleQuotes(java.lang.String)
- */
- public String getFirstStringBetweenSingleQuotes(String s)
- {
- return super.getFirstStringBetweenSingleQuotes(s);
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.java
deleted file mode 100644
index 25a7458..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorTest.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.xsd.core.internal.validation.eclipse;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Test the Eclipse specific XSD validator.
- */
-public class XSDValidatorTest 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(XSDValidatorTest.class);
- }
-
- /**
- * Test to ensure the URI resolver is not null in the Eclipse
- * specific XSD validator.
- */
- public void testURIResolverIsRegistered()
- {
- XSDValidatorWrapper validator = new XSDValidatorWrapper();
- assertNotNull("The URI resolver is null.", validator.getURIResolver());
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.java
deleted file mode 100644
index 9147eea..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidatorWrapper.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.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-
-/**
- * Wrapper for the Eclipse XSD validator class to allow for testing.
- */
-public class XSDValidatorWrapper extends XSDValidator
-{
- /**
- * Constructor.
- */
- public XSDValidatorWrapper()
- {
- 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.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
deleted file mode 100644
index 6ba1e61..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
+++ /dev/null
@@ -1,46 +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.xsd.validation.tests.internal;
-import junit.framework.Test;
-
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfigurationTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.ValidatorTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDMessageInfoHelperTest;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDValidatorTest;
-/**
- * The root test suite that contains all other XSD validator test suites.
- */
-public class AllXSDTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXSDTests();
- }
-
- /**
- * Constructor
- */
- public AllXSDTests()
- {
- super("AllXSDTests");
- addTest(ValidatorTest.suite());
- addTest(XSDMessageInfoHelperTest.suite());
- addTest(XSDValidatorTest.suite());
- addTest(BugFixesTest.suite());
- addTest(PathsTest.suite());
- addTestSuite(XSDValidationConfigurationTest.class);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
deleted file mode 100644
index fecd613..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,338 +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.xsd.validation.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-import org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDValidator;
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- */
-public class BaseTestCase extends TestCase
-{
- protected String FILE_PROTOCOL = "file:///";
- protected String PLUGIN_ABSOLUTE_PATH;
- protected String SAMPLES_DIR = "testresources/samples/";
- protected String GENERATED_RESULTS_DIR = "testresources/generatedResults/";
- protected String IDEAL_RESULTS_DIR = "testresources/idealResults/";
- protected String LOG_FILE_LOCATION = "results.log";
- protected static final String PLUGIN_NAME = "org.eclipse.wst.xsd.validation.tests";
- private XSDValidator validator = XSDValidator.getInstance();
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- PLUGIN_ABSOLUTE_PATH = XSDValidationTestsPlugin.getInstallURL();
- }
-
- /**
- * Run a validator test. The test will run the validator, log the results and compare the results
- * with the ideal results. The test will only pass if the two log files are the same.
- *
- * @param testfile The file to run the validator test on.
- * @param loglocation The location to create the log file.
- * @param idealloglocation The location of the ideal log file.
- */
- public void runTest(String testfile, String loglocation, String idealloglocation)
- {
- runTest(testfile, loglocation, idealloglocation, new XSDValidationConfiguration());
- }
- /**
- * Run a validator test. The test will run the validator, log the results and compare the results
- * with the ideal results. The test will only pass if the two log files are the same.
- *
- * @param testfile
- * The file to run the validator test on.
- * @param loglocation
- * The location to create the log file.
- * @param idealloglocation
- * The location of the ideal log file.
- * @param configuration
- * The XSDValidationConfiguration for this validation test.
- */
- public void runTest(String testfile, String loglocation, String idealloglocation, XSDValidationConfiguration configuration)
- {
- ValidationReport valreport = validator.validate(testfile, null, configuration);
- try
- {
- createLog(loglocation, valreport);
- String generatedLog = getStringFromFile(loglocation);
- String idealLog = getStringFromFile(idealloglocation);
- assertEquals(idealLog, generatedLog);
- } catch (Exception e)
- {
- fail("Could not compare log files");
- }
- }
-
- /**
- * Get a string representation of a file.
- *
- * @param filename the file name of the file to get the string representation.
- * @return The string representation if successful.
- * @throws Exception Thrown if unable to create a string representaion of the file.
- */
- private String getStringFromFile(String filename) throws Exception
- {
- StringBuffer filestring = new StringBuffer();
- Reader reader = null;
- BufferedReader bufreader = null;
- try
- {
- File file = new File(filename);
- reader = new FileReader(file);
- bufreader = new BufferedReader(reader);
- while (bufreader.ready())
- {
- filestring.append(bufreader.readLine() + "\n");
- }
- } catch (FileNotFoundException e)
- {
- throw new Exception();
- } finally
- {
- bufreader.close();
- reader.close();
- }
- return filestring.toString();
- }
-
- /**
- * Create a log file for an XSD test.
- *
- * @param filename The name of the log file to create.
- * @param valreport The validation report for this file.
- * @return The file contents as a string if successful or null if not successful.
- */
- private String createLog(String filename, ValidationReport valreport)
- {
- ValidationMessage[] valmessages = valreport.getValidationMessages();
- int nummessages = valmessages.length;//validator.getErrors().size() + validator.getWarnings().size();
- StringBuffer errorsString = new StringBuffer();
- StringBuffer warningsString = new StringBuffer();
- int numerrors = 0;
- int numwarnings = 0;
- for(int i = 0; i < nummessages; i++)
- {
- ValidationMessage valmes = valmessages[i];
- if(valmes.getSeverity() == ValidationMessage.SEV_LOW)
- {
- numwarnings++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "(");
- warningsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- warningsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- else
- {
- numerrors++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "(");
- errorsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- errorsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- }
- StringBuffer log = new StringBuffer();
- log.append("number of errors : " + numerrors + "\n");
- if(numwarnings > 0)
- {
- log.append("number of warnings : " + numwarnings + "\n");
- }
- log.append("\n------------error list-------------------------------------------\n");
- if(numerrors == 0)
- {
- log.append("(none)\n");
- }
- else
- {
- log.append(errorsString.toString());
- }
- if(numwarnings > 0)
- {
- log.append("------------warning list-----------------------------------------\n");
- log.append(errorsString.toString());
- }
- log.append(warningsString.toString());
- log.append("-----------------------------------------------------------------\n");
-
- DataOutputStream outStream = null;
- try
- {
- File logfile = new File(filename);
- File parent = logfile.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- if(logfile.exists())
- {
- logfile.delete();
- }
- logfile.createNewFile();
-
- outStream = new DataOutputStream(new FileOutputStream(filename, true));
- outStream.writeBytes(log.toString());
- outStream.close();
-
- } catch (IOException e)
- {
- // If we can't write the log then clear the log.
- log.delete(0, log.length());
- }
- return log.toString();
- }
-
- protected String getPluginName()
- {
- return PLUGIN_NAME;
- }
-
- private String createNestedMessageString(List nestedMessages)
- {
- return createNestedMessageString(nestedMessages, 0);
- }
-
- private String createNestedMessageString(List nestedMessages, int depth)
- {
- if(nestedMessages != null && nestedMessages.size() > 0)
- {
- String messageString = "";
- Iterator nestedMesIter = nestedMessages.iterator();
- while(nestedMesIter.hasNext())
- {
- ValidationMessage nesvalmes = (ValidationMessage)nestedMesIter.next();
- for(int i = 0; i < depth; i++)
- {
- messageString += " ";
- }
- // If the message contains any file references make them relative.
- String message = nesvalmes.getMessage();
- message = message.replaceAll("'[^']*" + getPluginName() + "[^'/]*/", "'");
- message = message.replaceAll("[(][^(]*" + getPluginName() + "[^'/]*/", "[(]");
- messageString += ("-> " + message + " [" + nesvalmes.getLineNumber() +", " + nesvalmes.getColumnNumber() +"]\n");
- messageString += createNestedMessageString(nesvalmes.getNestedMessages(), depth + 1);
- }
- return messageString;
- }
- else
- {
- return "";
- }
- }
-
- protected IProject createSimpleProject(String projectName, String[] files)
- {
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = workspace.getRoot().getProject(projectName);
- if(!project.exists())
- {
- try
- {
- project.create(null);
- }
- catch(CoreException e)
- {
- fail("Could not create project " + projectName + e);
- }
- }
- if(!project.isOpen())
- {
- try
- {
- project.open(null);
- }
- catch(CoreException e)
- {
- fail("Could not open project " + projectName + e);
- }
- }
- try
- {
- IProjectDescription projectDescription = project.getDescription();
- projectDescription.setName(projectName);
- project.setDescription(projectDescription, null);
- }
- catch(Exception e)
- {
- fail("Unable to set project properties for project " + projectName + ". " + e);
- }
-
- if(files != null)
- {
- int numfiles = files.length;
- for(int i = 0; i < numfiles; i++)
- {
- try
- {
- String filename = files[i];
- filename = filename.replace('\\','/');
- if(filename.startsWith("file:"))
- {
- filename = filename.substring(5);
- while(filename.startsWith("/"))
- {
- filename = filename.substring(1);
- }
- }
-
- File file = new File(filename);
- FileInputStream in = new FileInputStream(file);
- IFile iFile = project.getFile(file.getName());
- if(!iFile.exists())
- {
- iFile.create(in, true, null);
- in.close();
- }
- }
- catch(Exception e)
- {
- fail("Unable to locate file " + files[i]);
- }
- }
- }
- try
- {
- project.refreshLocal(-1, null);
- }
- catch(Exception e)
- {}
- return project;
- }
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
deleted file mode 100644
index 00bb327..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,240 +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
- * David Carver, Standards for Technology in Automotive Retail, bug 147033
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-
-
-
-/**
- * Test class for bug fixes.
- */
-public class BugFixesTest extends BaseTestCase
-{
- private 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);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- /**
- * Test /BugFixes/Empty.xsd
- */
- public void testEmpty()
- {
- String testname = "Empty";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
- */
- public void testInvalidSchemaInXMLCatalog()
- {
- String testname = "InvalidSchemaInXMLCatalog";
- String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "InvalidSchemaInXMLCatalog/" + testname + ".xsd-log";
-
- createSimpleProject("Project", new String[]{testfile});
-
-
- ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog nextCatalog = nextCatalogs[i];
- if(XMLCorePlugin.USER_CATALOG_ID.equals(nextCatalog.getId())){
- ICatalog userCatalog = nextCatalog.getReferencedCatalog();
- if(userCatalog != null)
- {
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("testKey");
- catalogEntry.setURI("http://testuri");
- userCatalog.addCatalogElement(catalogEntry);
- runTest("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd"/*FILE_PROTOCOL + file.getLocation().toString()*/, loglocation, idealloglocation);
- catalog.removeCatalogElement(catalogEntry);
- }
- }
- }
- }
-
- /**
- * Test /BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
- */
- public void testMissingClosingSchemaTag()
- {
- String testname = "MissingClosingSchemaTag";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "MissingClosingSchemaTag/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
- */
- public void testImportXSDWithXSDImportInDiffDir()
- {
- String testname = "ImportXSDWithXSDImportInDiffDir";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportXSDWithXSDImportInDiffDir/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
- */
- public void testImportInvalidLocation()
- {
- String testname = "ImportInvalidLocation";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportInvalidLocation/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
- */
- public void testTwoOpenBrackets()
- {
- String testname = "TwoOpenBrackets";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "TwoOpenBrackets/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/ImportWithIncorrectSlash/A.xsd
- */
- public void testImportWithIncorrectSlash()
- {
- String testname = "A";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /BugFixes/HonourAllSchemaLocations/dog.xsd
- */
- public void testHonourAllSchemaLocations()
- {
- String testname = "dog";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "HonourAllSchemaLocations/" + testname + ".xsd-log";
-
- XSDValidationConfiguration configuration = new XSDValidationConfiguration();
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- }
- catch(Exception e)
- {
- fail("Unable to set the HONOUR_ALL_SCHEMA_LOCATIONS feature to true: " + e);
- }
- runTest(testfile, loglocation, idealloglocation, configuration);
- }
-
- /**
- * Test /BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
- */
- public void testInvalidSchemaWithNamespaceInCatalog()
- {
- String testname = "InvalidSchemaWithNamespaceInCatalog";
- String testfile = PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "XSDRegisteredWithCatalog/" + testname + ".xsd-log";
-
- createSimpleProject("Project", new String[]{testfile});
-
-
- ICatalog catalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
- INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
- for (int i = 0; i < nextCatalogs.length; i++)
- {
- INextCatalog nextCatalog = nextCatalogs[i];
- if(XMLCorePlugin.USER_CATALOG_ID.equals(nextCatalog.getId())){
- ICatalog userCatalog = nextCatalog.getReferencedCatalog();
- if(userCatalog != null)
- {
- ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
- catalogEntry.setKey("http://www.eclipse.org/webtools/Catalogue");
- catalogEntry.setURI("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd");
- userCatalog.addCatalogElement(catalogEntry);
- runTest("platform:/resource/Project/InvalidSchemaWithNamespaceInCatalog.xsd", loglocation, idealloglocation);
- catalog.removeCatalogElement(catalogEntry);
- }
- }
- }
- }
-
- /**
- * Test /BugFixes/FullConformance/FullConformance.xsd
- * bug 147033
- */
- public void testFullConformance()
- {
- String testname = "FullConformance";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "FullConformance/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "FullConformance/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "FullConformance/" + testname + ".xsd-log";
-
- XSDValidationConfiguration configuration = new XSDValidationConfiguration();
- try
- {
- configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, true);
- configuration.setFeature(XSDValidationConfiguration.FULL_SCHEMA_CONFORMANCE, true);
- }
- catch(Exception e)
- {
- fail("Unable to set the FULL_SCHEMA_CONFORMANCE feature to true: " + e);
- }
- runTest(testfile, loglocation, idealloglocation, configuration);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java
deleted file mode 100644
index e2aaecd..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests that test various types of variations in file paths.
- */
-public class PathsTest extends BaseTestCase
-{
- private String PATHS_DIR = "Paths/";
-
- /**
- * Create a tests suite from this test class.
- *
- * @return A test suite containing this test class.
- */
- public static Test suite()
- {
- return new TestSuite(PathsTest.class);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- super.setUp();
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathValid.xsd
- */
- public void testSpaceInPathValid()
- {
- String testname = "SpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Space InPath/SpaceInPathInvalid.xsd
- */
- public void testSpaceInPathInvalid()
- {
- String testname = "SpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd
- */
- public void testCloseBracketInPathValid()
- {
- String testname = "CloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd
- */
- public void testCloseBrackettInPathInvalid()
- {
- String testname = "CloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd
- */
- public void testCloseBracketInFilenameValid()
- {
- String testname = "CloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd
- */
- public void testCloseBracketInFilenameInvalid()
- {
- String testname = "CloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathValid.xsd
- */
- public void testDashInPathValid()
- {
- String testname = "DashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/DashInPathInvalid.xsd
- */
- public void testDashInPathInvalid()
- {
- String testname = "DashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameValid.xsd
- */
- public void testDashInFilenameValid()
- {
- String testname = "Dash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/Dash-InFilenameInvalid.xsd
- */
- public void testDashInFilenameInvalid()
- {
- String testname = "Dash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathValid.xsd
- */
- public void testExclamationInPathValid()
- {
- String testname = "ExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd
- */
- public void testExclamationInPathInvalid()
- {
- String testname = "ExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd
- */
- public void testExclamationInFilenameValid()
- {
- String testname = "Exclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd
- */
- public void testExclamationInFilenameInvalid()
- {
- String testname = "Exclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd
- */
- public void testOpenBracketInPathValid()
- {
- String testname = "OpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd
- */
- public void testOpenBracketInPathInvalid()
- {
- String testname = "OpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd
- */
- public void testOpenBracketInFilenameValid()
- {
- String testname = "OpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd
- */
- public void testOpenBracketInFilenameInvalid()
- {
- String testname = "OpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathValid.xsd
- */
- public void testPeriodInPathValid()
- {
- String testname = "PeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/PeriodInPathInvalid.xsd
- */
- public void testPeriodInPathInvalid()
- {
- String testname = "PeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameValid.xsd
- */
- public void testPeriodInFilenameValid()
- {
- String testname = "Period.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
- */
- public void testPeriodInFilenameInvalid()
- {
- String testname = "Period.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathValid.xsd
- */
- public void testQuoteInPathValid()
- {
- String testname = "QuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/QuoteInPathInvalid.xsd
- */
- public void testQuoteInPathInvalid()
- {
- String testname = "QuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameValid.xsd
- */
- public void testQuoteInFilenameValid()
- {
- String testname = "Quote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd
- */
- public void testQuoteInFilenameInvalid()
- {
- String testname = "Quote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameValid.xsd
- */
- public void testSpaceInFilenameValid()
- {
- String testname = "Space InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/Space InFilenameInvalid.xsd
- */
- public void testSpaceInFilenameInvalid()
- {
- String testname = "Space InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathValid.xsd
- */
- public void testTildeInPathValid()
- {
- String testname = "TildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/TildeInPathInvalid.xsd
- */
- public void testTildeInPathInvalid()
- {
- String testname = "TildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameValid.xsd
- */
- public void testTildeInFilenameValid()
- {
- String testname = "Tilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
- */
- public void testTildeInFilenameInvalid()
- {
- String testname = "Tilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathValid.xsd
- */
- public void testUnderscoreInPathValid()
- {
- String testname = "UnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
- */
- public void testUnderscoreInPathInvalid()
- {
- String testname = "UnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
- */
- public void testUnderscoreInFilenameValid()
- {
- String testname = "Underscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
- */
- public void testUnderscoreInFilenameInvalid()
- {
- String testname = "Underscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathValid.xsd
- */
- public void testAngleHatInPathValid()
- {
- String testname = "AngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
- */
- public void testAngleHatInPathInvalid()
- {
- String testname = "AngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
- */
- public void testAngleHatInFilenameValid()
- {
- String testname = "AngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
- */
- public void testAngleHatInFilenameInvalid()
- {
- String testname = "AngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /*****************
- * Test Imports
- *****************/
-
- /**
- * Test /Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
- */
- public void testImportAngleHatInFilenameValid()
- {
- String testname = "ImportAngleHat^InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
- */
- public void testImportAngleHatInFilenameInvalid()
- {
- String testname = "ImportAngleHat^InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
- */
- public void testImportAngleHatInPathValid()
- {
- String testname = "ImportAngleHatInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
- */
- public void testImportAngleHatInPathInvalid()
- {
- String testname = "ImportAngleHatInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
-
- /**
- * Test /Paths/Space InPath/ImportSpaceInPathValid.xsd
- */
- public void testImportSpaceInPathValid()
- {
- String testname = "ImportSpaceInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Space InPath/ImportSpaceInPathInvalid.xsd
- */
- public void testImportSpaceInPathInvalid()
- {
- String testname = "ImportSpaceInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd
- */
- public void testImportCloseBracketInPathValid()
- {
- String testname = "ImportCloseBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd
- */
- public void testImportCloseBrackettInPathInvalid()
- {
- String testname = "ImportCloseBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd
- */
- public void testImportCloseBracketInFilenameValid()
- {
- String testname = "ImportCloseBracket)InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd
- */
- public void testImportCloseBracketInFilenameInvalid()
- {
- String testname = "ImportCloseBracket)InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/ImportDashInPathValid.xsd
- */
- public void testImportDashInPathValid()
- {
- String testname = "ImportDashInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Dash-InPath/ImportDashInPathInvalid.xsd
- */
- public void testImportDashInPathInvalid()
- {
- String testname = "ImportDashInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/ImportDash-InFilenameValid.xsd
- */
- public void testImportDashInFilenameValid()
- {
- String testname = "ImportDash-InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
- */
- public void testImportDashInFilenameInvalid()
- {
- String testname = "ImportDash-InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd
- */
- public void testImportExclamationInPathValid()
- {
- String testname = "ImportExclamationInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd
- */
- public void testImportExclamationInPathInvalid()
- {
- String testname = "ImportExclamationInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd
- */
- public void testImportExclamationInFilenameValid()
- {
- String testname = "ImportExclamation!InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd
- */
- public void testImportExclamationInFilenameInvalid()
- {
- String testname = "ImportExclamation!InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd
- */
- public void testImportOpenBracketInPathValid()
- {
- String testname = "ImportOpenBracketInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd
- */
- public void testImportOpenBracketInPathInvalid()
- {
- String testname = "ImportOpenBracketInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd
- */
- public void testImportOpenBracketInFilenameValid()
- {
- String testname = "ImportOpenBracket(InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd
- */
- public void testImportOpenBracketInFilenameInvalid()
- {
- String testname = "ImportOpenBracket(InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/ImportPeriodInPathValid.xsd
- */
- public void testImportPeriodInPathValid()
- {
- String testname = "ImportPeriodInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
- */
- public void testImportPeriodInPathInvalid()
- {
- String testname = "ImportPeriodInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
- */
- public void testImportPeriodInFilenameValid()
- {
- String testname = "ImportPeriod.InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
- */
- public void testImportPeriodInFilenameInvalid()
- {
- String testname = "ImportPeriod.InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/ImportQuoteInPathValid.xsd
- */
- public void testImportQuoteInPathValid()
- {
- String testname = "ImportQuoteInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd
- */
- public void testImportQuoteInPathInvalid()
- {
- String testname = "ImportQuoteInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd
- */
- public void testImportQuoteInFilenameValid()
- {
- String testname = "ImportQuote'InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd
- */
- public void testImportQuoteInFilenameInvalid()
- {
- String testname = "ImportQuote'InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
- */
- public void testImportSpaceInFilenameValid()
- {
- String testname = "ImportSpace InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
- */
- public void testImportSpaceInFilenameInvalid()
- {
- String testname = "ImportSpace InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/ImportTildeInPathValid.xsd
- */
- public void testImportTildeInPathValid()
- {
- String testname = "ImportTildeInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
- */
- public void testImportTildeInPathInvalid()
- {
- String testname = "ImportTildeInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
- */
- public void testImportTildeInFilenameValid()
- {
- String testname = "ImportTilde~InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
- */
- public void testImportTildeInFilenameInvalid()
- {
- String testname = "ImportTilde~InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
- */
- public void testImportUnderscoreInPathValid()
- {
- String testname = "ImportUnderscoreInPathValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
- */
- public void testImportUnderscoreInPathInvalid()
- {
- String testname = "ImportUnderscoreInPathInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
- */
- public void testImportUnderscoreInFilenameValid()
- {
- String testname = "ImportUnderscore_InFilenameValid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * Test /Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
- */
- public void testImportUnderscoreInFilenameInvalid()
- {
- String testname = "ImportUnderscore_InFilenameInvalid";
- String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xsd-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java
deleted file mode 100644
index 2a4a752..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java
+++ /dev/null
@@ -1,65 +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.xsd.validation.tests.internal;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The plugin class for this test plugin.
- */
-public class XSDValidationTestsPlugin extends Plugin
-{
- protected static Bundle pluginBundle;
-
- public XSDValidationTestsPlugin()
- {
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- pluginBundle = context.getBundle();
- }
-
- /**
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception
- {
- pluginBundle = null;
- super.stop(context);
- }
-
- /**
- * Get the install URL of this plugin.
- *
- * @return the install url of this plugin
- */
- public static String getInstallURL()
- {
- try
- {
- return FileLocator.resolve(pluginBundle.getEntry("/")).getFile();
- }
- catch (IOException e)
- {
- return null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/test.xml b/tests/org.eclipse.wst.xsd.validation.tests/test.xml
deleted file mode 100644
index 3fdec81..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xsd.validation.tests" />
-
- <property
- name="classname"
- value="org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${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="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </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">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore
deleted file mode 100644
index bb53574..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-generatedResults
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log
deleted file mode 100644
index aa478ac..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/FullConformance/FullConformance.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 2
-
-------------error list-------------------------------------------
-rcase-Recurse.2: There is not a complete functional mapping between the particles. [35, 43]
-derivation-ok-restriction.5.4.2: Error for type 'RestrictedFoo'. The particle of the type is not a valid restriction of the particle of the base. [35, 43]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/HonourAllSchemaLocations/dog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
deleted file mode 100644
index faffcef..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 1
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-schema_reference.4: Failed to read schema document 'subdir/importing.xsda', because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <xsd:schema>. [3, 98]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log
deleted file mode 100644
index 54a6653..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-src-resolve.4.2: Error resolving component 'stringa'. It was detected that 'stringa' is in namespace 'http://www.w3.org/2001/XMLSchema', but components from this namespace are not referenceable from schema document 'platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd'. If this is the incorrect namespace, perhaps the prefix of 'stringa' needs to be changed. If this is the correct namespace, then an appropriate 'import' tag should be added to 'platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd'. [3, 50]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log
deleted file mode 100644
index e7fb00d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 125]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log
deleted file mode 100644
index cf33997..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-The markup in the document preceding the root element must be well-formed. [1, 2]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log
deleted file mode 100644
index 5ed1a99..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Element type "complexType" must be followed by either attribute specifications, ">" or "/>". [6, 3]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log
deleted file mode 100644
index de3ac3b..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log
deleted file mode 100644
index 30aec09..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log"
deleted file mode 100644
index dc1a38f..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log"
deleted file mode 100644
index b4e4a0e..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log
deleted file mode 100644
index b41e209..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log
deleted file mode 100644
index e59820e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log"
deleted file mode 100644
index d669e7d..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log"
deleted file mode 100644
index 6990fde..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log"
deleted file mode 100644
index fd4c414..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log"
deleted file mode 100644
index 4461175..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log
deleted file mode 100644
index 1657405..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log
deleted file mode 100644
index fef8319..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log"
deleted file mode 100644
index d9584c8..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log"
deleted file mode 100644
index 361d757..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log"
deleted file mode 100644
index 97f8aa7..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log"
deleted file mode 100644
index 9bada50..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd-log"
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log
deleted file mode 100644
index 884d8a5..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log
deleted file mode 100644
index 0adf522..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 7f89ee8..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/TildeInFilename/Tilde%7EInFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 93a75e0..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log
deleted file mode 100644
index 1200096..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log
deleted file mode 100644
index 8d185d6..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log
deleted file mode 100644
index e0b0559..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log
+++ /dev/null
@@ -1,6 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-Referenced file contains errors (testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd). For more information, right click on the message in the Problems View and select "Show Details..." [1, 0]
--> XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log
deleted file mode 100644
index 97f8aa7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 1
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [4, 1]
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log
deleted file mode 100644
index 9bada50..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log
+++ /dev/null
@@ -1,5 +0,0 @@
-number of errors : 0
-
-------------error list-------------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd
deleted file mode 100644
index dd61c6a..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/FullConformance/FullConformance.xsd
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- xmlns:foo="urn:foo"
- targetNamespace="urn:foo"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.0">
- <xsd:complexType name="Foo">
- <xsd:sequence>
- <xsd:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="Foo" />
- <xsd:element
- maxOccurs="1"
- minOccurs="1"
- name="bar">
- <xsd:complexType>
- <xsd:attribute
- name="value"
- use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="bar01" />
- <xsd:enumeration value="bar02" />
- <xsd:enumeration value="bar03" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="RestrictedFoo">
- <xsd:complexContent>
- <xsd:restriction base="foo:Foo">
- <xsd:sequence>
- <xsd:element
- maxOccurs="1"
- minOccurs="1"
- name="Foo" />
- <xsd:element
- maxOccurs="1"
- minOccurs="1"
- name="bar">
- <xsd:complexType>
- <xsd:attribute
- name="value"
- use="required">
- <xsd:simpleType>
- <xsd:restriction
- base="xsd:string">
- <xsd:enumeration value="bar01" />
- <xsd:enumeration value="bar02" />
- <xsd:enumeration value="bar03" />
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd
deleted file mode 100644
index 21c81f7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part1.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Dog"
- xmlns:tns="http://www.example.org/Dog" >
-
- <complexType name="Head"></complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd
deleted file mode 100644
index 0b13d05..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/Part2.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/Dog"
- xmlns:tns="http://www.example.org/Dog" >
-
-
- <complexType name="Tail"></complexType>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd
deleted file mode 100644
index 6c4c669..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/HonourAllSchemaLocations/dog.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.org/ADog"
- xmlns:tns="http://www.example.org/ADog"
- xmlns:pref="http://www.example.org/Dog">
-
- <import namespace="http://www.example.org/Dog"
- schemaLocation="Part1.xsd">
- </import>
- <import namespace="http://www.example.org/Dog"
- schemaLocation="Part2.xsd">
- </import>
-
- <complexType name="DogType">
- <sequence>
-
- <element name="Tail" type="pref:Tail"></element>
- <element name="Body" type="string"></element>
- </sequence>
- </complexType>
-
- <element name="aDog" type="tns:DogType"></element>
-
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
deleted file mode 100644
index 4b8347e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/root" xmlns:ex="http://www.example.com/root">
- <import namespace="http://www.example.com/importing" schemaLocation="subdir/importing.xsda"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd
deleted file mode 100644
index 0c20fe1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC">
- <xsd:include schemaLocation="C.xsd"/>
- <xsd:import namespace="http://B" schemaLocation="B.xsd"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd
deleted file mode 100644
index b45007e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://B">
- <xsd:import namespace="http://AC" schemaLocation=".\C.xsd"/>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd
deleted file mode 100644
index f6df675..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://AC">
- <xsd:complexType name="SampleType">
- <xsd:sequence>
- <xsd:element name="SampleElement" nillable="true" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
deleted file mode 100644
index 95e6af0..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/root" xmlns:ex="http://www.example.com/root">
- <import namespace="http://www.example.com/importing" schemaLocation="subdir/importing.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd
deleted file mode 100644
index 9af5462..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/importing" xmlns:ex="http://www.example.com/importing" xmlns:simple="http://www.example.com/simple">
- <import namespace="http://www.example.com/simple" schemaLocation="simple.xsd"/>
- <simpleType name="mySimpleType">
- <list itemType="string"/>
- </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd
deleted file mode 100644
index 8810a4d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/simple" xmlns:ibm="http://www.example.com/simple">
- <element name="myElement" type="string"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
deleted file mode 100644
index 8044319..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/invalid" xmlns:invalid="http://www.example.com/invalid">
- <element name="NewGlobalElement" type="stringa"></element>
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
deleted file mode 100644
index d4d7634..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
deleted file mode 100644
index 297c8f6..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/TwoOpenBrackets" xmlns:tns="http://www.example.org/TwoOpenBrackets">
-</schema>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.xsd
deleted file mode 100644
index e3e24da..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/XSDRegisteredWithCatalog/InvalidSchemaWithNamespaceInCatalog.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.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
deleted file mode 100644
index c6df147..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHat^InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
deleted file mode 100644
index e084e6e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHat^InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
deleted file mode 100644
index 2d82c95..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHatInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
deleted file mode 100644
index 67bd0d7..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="AngleHatInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd"
deleted file mode 100644
index 8bd9a74..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracketInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd"
deleted file mode 100644
index 2180513..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket\051InPath/ImportCloseBracketInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracketInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd"
deleted file mode 100644
index d60d06f..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracket)InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd"
deleted file mode 100644
index 7a2503b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket\051InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="CloseBracket)InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd
deleted file mode 100644
index 09648ca..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="DashInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd
deleted file mode 100644
index 3f2da8d..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="DashInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
deleted file mode 100644
index c534d83..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Dash-InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd
deleted file mode 100644
index b6334ae..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Dash-InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ExclamationInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd"
deleted file mode 100644
index 3189ff3..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="ExclamationInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd"
deleted file mode 100644
index e8390c6..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation\041InPath/ImportExclamationInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="ExclamationInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd"
deleted file mode 100644
index 3430528..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Exclamation!InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd"
deleted file mode 100644
index e92dd97..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation\041InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Exclamation!InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd"
deleted file mode 100644
index 1412516..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracketInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd"
deleted file mode 100644
index ee461dd..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/ImportOpenBracketInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracketInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd"
deleted file mode 100644
index 70a67e9..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracket(InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd"
deleted file mode 100644
index d0ab738..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket\050InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="OpenBracket(InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
deleted file mode 100644
index 4897802..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="PeriodInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd
deleted file mode 100644
index 223ab33..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="PeriodInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
deleted file mode 100644
index dc62544..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Period.InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
deleted file mode 100644
index 4e97d47..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Period.InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd"
deleted file mode 100644
index fd7496c..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="QuoteInPathInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd"
deleted file mode 100644
index 4f83c85..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/ImportQuoteInPathValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="QuoteInPathValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote\047InPath/QuoteInPathValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd"
deleted file mode 100644
index f1fb34b..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Quote'InFilenameInvalid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd"
deleted file mode 100644
index 9ccf6de..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote\047InFilenameValid.xsd"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Quote'InFilenameValid.xsd"/>
-</schema>
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd"
deleted file mode 100644
index a0c6a60..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd" "b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd"
deleted file mode 100644
index d27f474..0000000
--- "a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote\047InFilenameValid.xsd"
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd
deleted file mode 100644
index 63a27ad..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="SpaceInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd
deleted file mode 100644
index 3c93d20..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="SpaceInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
deleted file mode 100644
index 97c0baa..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Space InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
deleted file mode 100644
index 916ba37..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Space InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
deleted file mode 100644
index 2a09853..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Tilde~InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
deleted file mode 100644
index fbe9a6c..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Tilde~InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
deleted file mode 100644
index 6963d4b..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="TildeInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd
deleted file mode 100644
index 1c81133..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="TildeInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
deleted file mode 100644
index 0bda16e..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Underscore_InFilenameInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
deleted file mode 100644
index cf216fc..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="Underscore_InFilenameValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
deleted file mode 100644
index c5277a1..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="UnderscoreInPathInvalid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
deleted file mode 100644
index fd74266..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/import" xmlns:ex="http://www.example.com/import">
- <import namespace="http://www.example.com" schemaLocation="UnderscoreInPathValid.xsd"/>
-</schema>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
deleted file mode 100644
index a0c6a60..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd b/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd
deleted file mode 100644
index d27f474..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com" xmlns:ex="http://www.example.com">
-</schema>
