This commit was manufactured by cvs2svn to create tag 'v20050413_1845'.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tests/org.eclipse.jst.jsp.core.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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore b/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
deleted file mode 100644
index f35525c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.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.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a7b18c5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:46:32 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index 3ceab41..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- jspcoretests.jar
-jars.compile.order = jspcoretests.jar
-source.jspcoretests.jar = src/
-output.jspcoretests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.core.tests/plugin.xml b/tests/org.eclipse.jst.jsp.core.tests/plugin.xml
deleted file mode 100644
index ec9a6ef..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.jsp.core.tests"
- name="JSP Core Tests"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin">
-
- <runtime>
- <library name="jspcoretests.jar">
- <export name="*" />
- </library>
- </runtime>
- <requires>
- <import plugin="org.junit" />
- <import plugin="org.eclipse.wst.html.core" />
- <import plugin="org.eclipse.wst.xml.core" />
- <import plugin="org.eclipse.wst.sse.core" />
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jst.jsp.core"/>
- <import plugin="org.eclipse.wst.css.core"/>
- </requires>
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/CleanupFormatTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/CleanupFormatTests.java
deleted file mode 100644
index b0d76f3..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/CleanupFormatTests.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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.CleanupTester;
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-
-
-public class CleanupFormatTests extends TestSuite {
- public static Test suite() {
- return new CleanupFormatTests();
- }
-
- public CleanupFormatTests() {
- super("CleanupFormatTests");
-
- addTest(new TestSuite(CleanupTester.class, "CleanupTester"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
deleted file mode 100644
index 092b08a..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-
-
-
-public class JSPCoreTestSuite extends TestSuite {
- public static Test suite() {
- return new JSPCoreTestSuite();
- }
-
- public JSPCoreTestSuite() {
- super("SSEModelTestSuiteForJSP");
-
- addTest(CleanupFormatTests.suite());
- addTest(ModelCloneTests.suite());
- addTest(new TestSuite(TestModelHandlers.class, "TestModelHandlers"));
- addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
- addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index 7f38eae..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCoreTestsPlugin extends Plugin {
- //The shared instance.
- private static JSPCoreTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public JSPCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.core.tests.TestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPCoreTestsPlugin 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 = JSPCoreTestsPlugin.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;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = Platform.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;
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
deleted file mode 100644
index 2c09e04..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-/**
- * 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 Plugin fPlugin = JSPCoreTestsPlugin.getDefault();
- private static final String fPluginId = fPlugin.getDescriptor().getUniqueIdentifier();
-
- 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, fPluginId, severity, message, exception);
- fPlugin.getLog().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, fPluginId, IStatus.OK, message, exception);
- fPlugin.getLog().log(statusObj);
- }
- }
-
- /**
- * @return true if the plugin for this logger is debugging
- */
- public static boolean isDebugging() {
- return fPlugin.isDebugging();
- }
-
- /**
- * 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(fPluginId + 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);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneTests.java
deleted file mode 100644
index 18e4cca..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneTests.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ModelCloneTests extends TestSuite {
- public static Test suite() {
- return new ModelCloneTests();
- }
-
- public ModelCloneTests() {
- super("ModelCloneTests");
-
- addTest(new TestSuite(TestStructuredDocumentClone.class, "TestStructuredDocumentClone"));
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
deleted file mode 100644
index debfacf..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-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.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
deleted file mode 100644
index a6ad490..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- *
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
- /**
- * Constructor for TestModelManager.
- *
- * @param name
- */
- public TestModelManager(String name) {
- super(name);
- }
-
- public void testModelManager() throws IOException {
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- assertTrue("modelManager must not be null", modelManager != null);
-
- try {
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
- assertTrue("basic XML empty model could not be created", model != null);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testNullArgument() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
- Exception e = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- try {
- model = modelManager.getModelForEdit((String) null, null, null);
- } catch (IllegalArgumentException exception) {
- e = exception;
- assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
deleted file mode 100644
index 7afd885..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-/**
- * @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 TestStructuredDocumentClone extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestStructuredDocumentClone(String name) {
- super(name);
- }
-
- public static void main(String[] args) {
- }
-
- public static Test getTest() {
- return new TestStructuredDocumentClone("testCloneStructuredModelJSPXML");
- }
-
- public void testCloneStructuredDocumentXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of XML structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSP structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- String testContent = "<@! page contentType=\"text/xml\" @>";
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", testContent, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSPXML structuredDocument is not correct", passed);
-
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
deleted file mode 100644
index aa97958..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-
-public class CleanupTester extends TestCase {
- protected IModelManager fModelManager = null;
- protected CleanupProcessorXML fCleanupProcessor = null;
- protected HTMLCleanupProcessorImpl fHTMLCleanupProcessor = null;
-
- public CleanupTester(String name) {
- super(name);
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get cleanup processor
- fCleanupProcessor = new CleanupProcessorXML();
-
- // get HTML cleanup processor
- fHTMLCleanupProcessor = new HTMLCleanupProcessorImpl();
- }
-
- public void testCleanupInsertTagsQuoteAttrs() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // use for debugging
-// String precleaned = structuredModel.getStructuredDocument().get();
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.ASIS);
- cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.ASIS);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTagsQuoteAttrs.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupInsertTags() throws IOException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.ASIS);
- cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.ASIS);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupCompressEmptyElementTags() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.ASIS);
- cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.ASIS);
- cleanupPreferences.setCompressEmptyElementTags(true);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(false);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(true);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterCompressEmptyElementTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTML() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTMLtwice() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.afterCleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
-// public void testCleanupJSPEmptyTags1() throws UnsupportedEncodingException, IOException {
-// // get model
-// IStructuredModel structuredModel = getModel("login.jsp");
-//
-// // init CleanupPreferences
-// IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-// cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-// cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-// cleanupPreferences.setCompressEmptyElementTags(false);
-// cleanupPreferences.setInsertRequiredAttrs(false);
-// cleanupPreferences.setInsertMissingTags(true);
-// cleanupPreferences.setQuoteAttrValues(true);
-// cleanupPreferences.setFormatSource(true);
-// cleanupPreferences.setConvertEOLCodes(false);
-//
-// // cleanup
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-// fHTMLCleanupProcessor.cleanupModel(structuredModel);
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-// // compare
-// String cleaned = structuredModel.getStructuredDocument().get();
-// String expectedFileName = "login.afterCleanup.jsp";
-// String expected = getFile(expectedFileName);
-// compare(expectedFileName, expected, cleaned);
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
-//
-// public void testCleanupJSPEmptyTags2() throws UnsupportedEncodingException, IOException {
-// // get model
-// IStructuredModel structuredModel = getModel("subscription.jsp");
-//
-// // init CleanupPreferences
-// IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-// cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-// cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-// cleanupPreferences.setCompressEmptyElementTags(false);
-// cleanupPreferences.setInsertRequiredAttrs(false);
-// cleanupPreferences.setInsertMissingTags(true);
-// cleanupPreferences.setQuoteAttrValues(true);
-// cleanupPreferences.setFormatSource(true);
-// cleanupPreferences.setConvertEOLCodes(false);
-//
-// // cleanup
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-// fHTMLCleanupProcessor.cleanupModel(structuredModel);
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-// // compare
-// String cleaned = structuredModel.getStructuredDocument().get();
-// String expectedFileName = "subscription.afterCleanup.jsp";
-// String expected = getFile(expectedFileName);
-// compare(expectedFileName, expected, cleaned);
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
-
- protected String readFile(String fileName) throws IOException {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[2048];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer, 0, bytesRead);
- //bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
- }
- finally {
- if (fileInputStream != null)
- fileInputStream.close();
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) throws UnsupportedEncodingException, IOException {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF-8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- // since in test code, no need to catch this
- // catch (Exception exception) {
- // Logger.logException(exception);
- // }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) throws IOException {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String cleaned) {
- if (cleaned.compareTo(expected) != 0) {
- if (Debug.failedTests) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== cleaned file ==========");
- System.out.println(cleaned);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== cleaned file ==========");
- String cleanedString = StringUtils.replace(cleaned, "\r", "\\r");
- cleanedString = StringUtils.replace(cleanedString, "\n", "\\n");
- cleanedString = StringUtils.replace(cleanedString, "\t", "\\t");
- System.out.println(cleanedString);
- System.out.println("=======================================");
- }
- assertTrue(false);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
deleted file mode 100644
index 5ce7291..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-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.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-
-public class FormatTester extends TestCase {
- protected IModelManager fModelManager = null;
- protected FormatProcessorXML fFormatProcessor = null;
- protected HTMLFormatProcessorImpl fHTMLFormatProcessor = null;
-
- public FormatTester(String name) {
- super(name);
-
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get format processor
- fFormatProcessor = new FormatProcessorXML();
-
- // get HTML format processor
- fHTMLFormatProcessor = new HTMLFormatProcessorImpl();
- }
-
- public void testFormat261968() {
- // get model
- IStructuredModel structuredModel = getModel("261968.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "261968.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpen() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpen.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpen.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpenTagClose() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpenTagClose.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpenTagClose.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTags() {
- // get model
- IStructuredModel structuredModel = getModel("tags.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tags.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatEmpty() {
- // get model
- IStructuredModel structuredModel = getModel("empty.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneSpace() {
- // get model
- IStructuredModel structuredModel = getModel("oneSpace.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneChar() {
- // get model
- IStructuredModel structuredModel = getModel("oneChar.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "oneChar.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpaces() {
- // get model
- IStructuredModel structuredModel = getModel("spaces.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatChars() {
- // get model
- IStructuredModel structuredModel = getModel("chars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpacesAndChars() {
- // get model
- IStructuredModel structuredModel = getModel("spacesAndChars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormat() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLines() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatBlockComments() {
- // get model
- IStructuredModel structuredModel = getModel("blockComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "blockComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineComments() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineCommentsSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testHTMLFormat() {
- // get model
- IStructuredModel structuredModel = getModel("HitCounterIntro.html");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fHTMLFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = false;
- fHTMLFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "HitCounterIntro.afterDefaultFormat.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- protected String readFile(String fileName) {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[1024];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer);
- bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
-
- if (fileInputStream != null)
- fileInputStream.close();
- }
- catch (IOException exception) {
- printException(exception);
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- catch (Exception exception) {
- exception.printStackTrace();
- }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String formatted) {
- if (formatted.compareTo(expected) != 0) {
- if (Debug.failedTests) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== formatted file ==========");
- System.out.println(formatted);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== formatted file ==========");
- String formattedString = StringUtils.replace(formatted, "\r", "\\r");
- formattedString = StringUtils.replace(formattedString, "\n", "\\n");
- formattedString = StringUtils.replace(formattedString, "\t", "\\t");
- System.out.println(formattedString);
- System.out.println("=======================================");
- }
- assertTrue(false);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 0483882..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>
- /t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2>
- </t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- t3>
- </t3>
-</tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>/t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2></t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 > <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 ><t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 >t3></t3>
-</tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index c3cb643..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,116 +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 http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
- action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
- height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG
- src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java servlet to
- count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to store the
- counter. If you have not already installed and configured your
- database for the WebSphere samples, refer to <A
- href="../Configuration/DBConfig.html">Database Configuration</A> for
- instructions. </FONT></P>
- <P><FONT size="-1"><A href="javascript:document.myForm.submit()"
- target="_self"> <B>Run this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
- name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a counter
- every time it is invoked </FONT>
- <UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that invokes the
- servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides information
- about the servlet to the WebSphere Application Server </FONT>
- </UL>
- </UL>
- <P><FONT size="-1">The Application Server processes .jsp files
- with its JSP 1.0 processor servlet. It handles the <jsp:include
- ... /> tag as a server-side include, replacing the tag with the
- variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
- cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
- cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
- width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1"> How to use this sample on your web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any HTML page you
- have on your site. Rename the HTML file with a .jsp file
- extension, put the Java .class and .servlet files in the classes
- folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca18..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +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 http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name = "myForm" method="post" action="../Controllers/SampleController">
- <TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2">
- <IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
- <P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
- </UL>
- <P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the <jsp:include ... /> tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b8413..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
- <!--
- No space
- -->
- <!--
- OneSpace
- -->
- <!--
- One tab
- -->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.-->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
-
- -->
- <!--
-
-
-
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
-
-
-
- -->
- <item type="appetizer">
- <!-- a
- b-->
- <!-- a
- b -->
- <!--
- a
- b-->
- <!--
- a
- b -->
- <!--
- a
- b
- -->
- <!-- a
- b
- -->
- <!--
-
-
-
- a
-
-
-
- b
-
-
-
- -->
- <desc>Prosciutto ham with melon</desc>
- <!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 2969878..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
- <!-- comment on a new line -->
- <menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
- One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
- <item type="appetizer">
-<!-- a
- b-->
-<!-- a
- b -->
-<!--
-a
- b-->
-<!--
-a
- b -->
-<!--
-a
- b
--->
-<!-- a
- b
- -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
- <desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f8..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index 847d8d7..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-</HTML><HTML>
-</HTML>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a00..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price units="usd" units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price
- units="usd"
- units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bc..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc> <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/> <!-- inline comment after tag --></price>
-<price units="usd"> <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +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=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" 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>A wedding ring</description></Item></Invoice>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +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="custNumber"/>
- <BillTo custNumber= "custNumber"/>
- <BillTo custNumber ="custNumber"/>
- <BillTo custNumber = "custNumber"/>
- <BillTo custNumber="custNumber" name="Craig" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name="name" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name = "Craig" phone="phone"/>
- <BillTo custNumber="custNumber" name="name" phone="phone"/>
- <BillTo custNumber = "X5739" name="Craig Salter" 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>A wedding ring</description></Item></Invoice>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +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
- </Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" 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
- </Header>
- <Item discount=promotion price=57>
- <description>A wedding ring
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username & password to connect to the database.<BR>
-This username & password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
- type="hidden" name="command"
- value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
- name="previous_page" value="Login/Login.jsp"> <A
- href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40"
- value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40"
- value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username & password to connect to the database.<BR>
-This username & password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecb..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7f..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name" v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
- xmi.version="1.0"
- timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel
- xmi.name="UML"
- xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1"
- xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension
- xmi.extender="IXT"
- xmi.extenderID="">
- <ixts s="IDL">
- <ixttv
- t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D" />
- <ixttv
- t="is_unit"
- v="TRUE" />
- <ixttv
- t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat"" />
- <ixttv
- t="is_loaded"
- v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv
- t="charSet"
- v="0" />
- <ixttv
- t="version"
- v="43" />
- <ixttv
- t="_written"
- v=""Rose 6.5.9232.10"" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5c..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>
- XMI Toolkit
- </XMI.exporter>
-
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.metamodel xmi.name = "UML" xmi.version
- =
- "1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public"/>
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
- />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D"
- />
- <ixttv
- t="is_unit"
- v="TRUE"
- />
- <ixttv t="file_name"
- v=""$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat""
- />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v=""Rose 6.5.9232.10"" /></ixts></XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
deleted file mode 100644
index 01ad2f9..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb5..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
- abc
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Create">
- <TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Delete">
- <TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Edit">
- <TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
- <html:hidden property="action" />
- <TABLE border="0" width="100%">
-
- <TR>
- <TH align="right"><bean:message key="prompt.username" />:</TH>
- <TD align="left"><bean:write name="user" property="username"
- filter="true" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
- <TD align="left"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:text property="host" size="50" />
- </logic:equal> <logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:hidden property="host" write="true" />
- </logic:notEqual></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
- <TD align="left"><html:text property="username" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
- <TD align="left"><html:password property="password" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
- <TD align="left"><html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label" />
- </html:select></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
- <TD align="left"><html:checkbox property="autoConnect" /></TD>
- </TR>
-
- <TR>
- <TD align="right"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal></TD>
- <TD align="left"><logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset" />
- </html:reset>
- </logic:notEqual> <html:cancel>
- <bean:message key="button.cancel" />
- </html:cancel></TD>
- </TR>
-
- </TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
- <tr>
- <th align="right">
- <bean:message key="prompt.username"/>:
- </th>
- <td align="left">
- <bean:write name="user" property="username" filter="true"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailHostname"/>:
- </th>
- <td align="left">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:text property="host" size="50"/>
- </logic:equal>
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:hidden property="host" write="true"/>
- </logic:notEqual>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailUsername"/>:
- </th>
- <td align="left">
- <html:text property="username" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailPassword"/>:
- </th>
- <td align="left">
- <html:password property="password" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailServerType"/>:
- </th>
- <td align="left">
- <html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.autoConnect"/>:
- </th>
- <td align="left">
- <html:checkbox property="autoConnect"/>
- </td>
- </tr>
-
- <tr>
- <td align="right">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- </td>
- <td align="left">
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset"/>
- </html:reset>
- </logic:notEqual>
-
- <html:cancel>
- <bean:message key="button.cancel"/>
- </html:cancel>
- </td>
- </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa784..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e48..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235d..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949b..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag >
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f83..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-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;
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index 3f373c2..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsp.core.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML;
-
-/**
- * This class is to test very basics of content type handlers.
- *
- * It tests that
- *
- * BVT: content registry can be / is created 5 expected contentTypeIdentifiers
- * can be created/found based on id. there is one and only one default content
- * type handler.
- *
- *
- *
- *
- */
-public class TestContentTypeHandlers extends TestCase {
- private static final boolean DEBUG = false;
-
- public TestContentTypeHandlers(String name) {
- super(name);
- }
-
- private static IContentTypeManager getContentTypeRegistry() {
- IContentTypeManager registry = Platform.getContentTypeManager();
- return registry;
- }
-
- public void testCreation() {
- IContentTypeManager registry = getContentTypeRegistry();
- assertTrue("content type identifer registry must exist", registry != null);
- if (DEBUG) {
- IContentType[] allTypes = registry.getAllContentTypes();
- for (int i = 0; i < allTypes.length; i++) {
- System.out.println(allTypes[i]);
-
- }
- }
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_SSEXML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have custom XML type ", identifier != null);
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have DTD type ", identifier != null);
- }
-
- public void testXMLExistsByFileExtension() throws IOException {
- String filename = "test.xml";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have XML type ", identifier != null);
- }
-
- public void testHTMLExistsByFileExtension() throws IOException {
- String filename = "test.html";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExistsByFileExtension() throws IOException {
- String filename = "test.jsp";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExistsByFileExtension() throws IOException {
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExistsByFileExtension() throws IOException {
- String filename = "test.dtd";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have DTD type ", identifier != null);
- }
-
- public void testMultipleDefinitions() throws IOException {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier1 = registry.getContentType(id);
- IContentType identifier2 = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("mulitple content type identifiers need to map to same instance ", identifier1 == identifier2);
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
deleted file mode 100644
index 67cc7af..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML;
-
-public class TestModelHandlers extends TestCase {
- private static ModelHandlerRegistry getModelHandlerRegistry() {
- ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
- return registry;
- }
-
- public TestModelHandlers() {
- super();
- }
-
- public void testCreation() {
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- assertTrue("model handler registry must exist", registry != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS; //"com.ibm.sse.model.handler.css";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testCSSExistsFromFilename() throws IOException {
- String filename = "test.css";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForCSS.ContentTypeID_CSS));
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testDTDExistsFromFilename() throws IOException {
- String filename = "test.dtd";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals("org.eclipse.wst.dtd.core.dtdsource"));
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testHTMLExistsFromFilename() throws IOException {
- String filename = "test.html";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForHTML.ContentTypeID_HTML));
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testJSPExistsFromFilename() throws IOException {
- String filename = "test.jsp";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForJSP.ContentTypeID_JSP));
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_XML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertEquals("model handler registry does not have XML type ", id, handler.getAssociatedContentTypeId());
- }
-
- public void testXMLExistsFromFilename() throws IOException {
- String filename = "test.xml";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertEquals("model handler registry does not have XML type ", ContentTypeIdForXML.ContentTypeID_XML, handler.getAssociatedContentTypeId());
- }
-
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
deleted file mode 100644
index 74a99c3..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.Logger;
-import org.eclipse.wst.html.core.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This test will cause a "region management error" to be thrown in DOM parser
- * (and its subsequent 'handleRefresh' to be called). This is "normal" in this
- * error case, of appending an jsp element to an html document. This
- * error/exception is not normally printed out, but is if 'debug' is turned on.
- */
-
-public class TestOrphan extends TestCase {
-
- private static final String fCategory = "unittests";
-
- public TestOrphan(String name) {
-
- super(name);
- }
-
- private Document getJSPDoc() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Document getHTMLDoc() {
-
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Element makeElement(Document document) {
-
- Element element = document.createElement("IMG");
- element.setAttribute("src", "<bean:message />");
- return element;
- }
-
- public void testNonOrphanInHTMLDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInHTMLDoc");
- Document doc = getHTMLDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInJSPDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInJSPDoc");
- Document doc = getJSPDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void testNonOrphanInBoth() {
-
- Logger.trace(fCategory, "testNonOrphanInBoth");
- Document jspDoc = getJSPDoc();
- Element commonElement = makeElement(jspDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- jspDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- Document htmlDoc = getHTMLDoc();
- // this test will cause a "region management error" to be
- // thrown in parser (and its subsequent 'handleRefresh').
- // this is "normal" in this error case, of appending an jsp
- // element to an html document. This error/exception is not
- // normally printed out, but is if 'debug' is turned on.
- htmlDoc.appendChild(commonElement);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInBothReversedOrder() {
-
- Logger.trace(fCategory, "testNonOrphanInBothReversedOrder");
- Document htmlDoc = getHTMLDoc();
- Element commonElement = makeElement(htmlDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- htmlDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- Document jspDoc = getJSPDoc();
- // this little test shows its important to
- // actually create the element with the right kind of
- // document, not just append.
- // (and, append is needed too, as can be seen by
- // commenting out one or the other of the following
- // two lines.
- commonElement = makeElement(jspDoc);
- jspDoc.appendChild(commonElement);
- //
- attr = (AttrImpl) commonElement.getAttributeNode("src");
- attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void doBothTests() {
-
- testNonOrphanInHTMLDoc();
- testNonOrphanInJSPDoc();
- testNonOrphanInBoth();
- testNonOrphanInBothReversedOrder();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml
deleted file mode 100644
index 3529f08..0000000
--- a/tests/org.eclipse.jst.jsp.core.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.jsp.core.tests" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- 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.jst.jsp.core.tests.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.jst.jsp.core.tests.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!-- <emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </target>
-
-</project>
\ No newline at end of file
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 065ac06..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6c8ddd4..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:46:57 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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 5b5de84..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = plugin.xml,\
- jspencodingtests.jar,\
- testfiles/,\
- test.xml
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.xml b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.xml
deleted file mode 100644
index 0145e00..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.jsp.tests.encoding"
- name="JSP Encoding Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin">
-
- <runtime>
- <library name="jspencodingtests.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jst.jsp.core"/>
- <import plugin="org.eclipse.wst.xml.core"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.wst.sse.core"/>
- </requires>
-
-</plugin>
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 1f77b1d..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.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;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.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);
- }
-}
\ No newline at end of file
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 3798ccb..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.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");
- }
- else {
- 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 = Platform.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;
- }
-
-}
\ No newline at end of file
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 7ff1bf9..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.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 = 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";
- doTestFileStream(filename, "UTF-16BE", 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";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16WithJapaneseChars() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.jsp";
- doTestFileStream(filename, "UTF-16BE", 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());
- }
-
-}
\ No newline at end of file
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 f0ea074..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-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.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
- private 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 void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
- JSPHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new JSPHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
- 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 {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
- }
- }
-
- // 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 (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- protected String getContentType() {
- return fContentType;
- }
-
- private boolean isLegalString(String tokenType) {
- if (tokenType == null)
- return false;
- else
- return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
-
- private void parseContentTypeValue(String contentType) {
- Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
- 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()) {
- fCharset = parts[0].substring(eqpos);
- fCharset = fCharset.trim();
- }
- }
- }
- }
- else {
- fContentType = parts[0];
- }
- }
- if (parts.length > 1) {
- fCharset = parts[1];
- }
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws IOException {
- fPageEncodingValue = null;
- fCharset = null;
- fContentType = 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();
- String tokenType = token.getType();
- 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()) {
- // IHeadParserToken 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;
- }
-
- public void testBestCase() throws IOException {
- String filename = fileLocation + "nomalDirectiveCase.jsp";
- doTestFile(filename, "ISO-8859-2");
- }
-
- // 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 = fileLocation + "EmptyFile.jsp";
- doTestFile(filename, null);
- }
-
- public void testNomalDirectiveCaseUsingXMLSyntax() throws IOException {
- String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
- doTestFile(filename, "ISO-8859-2");
- }
-
- public void testNoPageDirective() throws IOException {
- String filename = fileLocation + "testNoPageDirective.jsp";
- doTestFile(filename, null);
- }
-
- public void testNoPageDirectiveAtFirst() throws IOException {
- String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
- doTestFile(filename, "ISO-8859-2");
- }
-
- public void testNoPageDirectiveInLargeFile() throws IOException {
- String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
- }
-
- public void testNormalCaseWithNeither() throws IOException {
- String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalCharset() throws IOException {
- String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
- doTestFile(filename, "ISO-8859-3");
- }
-}
\ No newline at end of file
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 b6568cf..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- 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}\..\.." /> -->
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.jsp.tests.encoding" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.jst.jsp.tests.encoding.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true" />
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="org.eclipse.jst.jsp.tests.encoding" />
- <property name="classname" value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.jst.jsp.tests.encoding.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!--<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </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 8e9cf4a..0000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ page import="com.ibm.wps.*" %>
-<%@ 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/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/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/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.wst.css.core.tests/.classpath b/tests/org.eclipse.wst.css.core.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tests/org.eclipse.wst.css.core.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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 28e041b..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-dev.properties
-temp.folder
-csscoretests.jar
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.jdt.core.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fa6199e..0000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:47:25 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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 81bd36a..0000000
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- csscoretests.jar,\
- src/
-src.includes = plugin.xml,\
- src/,\
- test.xml
-jars.compile.order = csscoretests.jar
-source.csscoretests.jar = src/
-output.csscoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.xml b/tests/org.eclipse.wst.css.core.tests/plugin.xml
deleted file mode 100644
index 48474bf..0000000
--- a/tests/org.eclipse.wst.css.core.tests/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.css.core.tests"
- name="CSS Core Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin">
-
- <runtime>
- <library name="csscoretests.jar">
- <export name="*" />
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.wst.css.core" />
- <import plugin="org.junit" />
- <import plugin="org.eclipse.wst.sse.core" />
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-
-</plugin>
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 df96f22..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
+++ /dev/null
@@ -1,55 +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;
-
-import org.eclipse.wst.css.core.tests.model.BUG73990SelectorFormatTest;
-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.CSSImportRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMediaRuleTest;
-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.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;
-
-
-public class CSSAllTests extends TestSuite {
- public static Test suite() {
- TestSuite suite = new TestSuite("SSE Model CSS Tests");
-
- addSourceTests(suite);
- addModelTests(suite);
-
- 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(BUG73990SelectorFormatTest.class);
- }
-}
\ No newline at end of file
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/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 5e47f74..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
+++ /dev/null
@@ -1,174 +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 junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-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.preferences.CSSModelPreferenceNames;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.preferences.CommonModelPreferenceNames;
-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(CSSModelPreferenceNames.CASE_IDENTIFIER, CommonModelPreferenceNames.LOWER);
- prefs.setValue(CSSModelPreferenceNames.CASE_PROPERTY_NAME, CommonModelPreferenceNames.LOWER);
- prefs.setValue(CSSModelPreferenceNames.CASE_PROPERTY_VALUE, CommonModelPreferenceNames.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);
- }
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java
deleted file mode 100644
index cb05a8d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.wst.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-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.text.IStructuredDocument;
-
-public class BUG73990SelectorFormatTest 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",
- "BUG73990_selector_unformatted.css"));
-
- (new FormatProcessorCSS()).formatModel(model);
-
- String expected = FileUtil.createString(
- "src/org/eclipse/wst/css/core/tests/testfiles/results",
- "BUG73990_selector_formatted.css");
- // Note: FileUtil.createString() added a commonEOL to the expected
- // string. We have to concat a commonEOL to the actual string.
- String actual = structuredDocument.get().concat(FileUtil.commonEOL);
- assertEquals(expected, actual);
- }
-}
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 d00a9b0..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
+++ /dev/null
@@ -1,48 +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.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());
- }
-}
\ No newline at end of file
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 c604a58..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
+++ /dev/null
@@ -1,265 +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 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.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"));
- }
-}
\ No newline at end of file
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 fc579b5..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
+++ /dev/null
@@ -1,94 +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.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());
- }
-}
\ No newline at end of file
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 306d9a1..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
+++ /dev/null
@@ -1,42 +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.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());
- }
-}
\ No newline at end of file
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 5325bcd..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
+++ /dev/null
@@ -1,215 +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 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.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"));
- }
-}
\ No newline at end of file
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 4bca9dd..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
+++ /dev/null
@@ -1,218 +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 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.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(19, 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));
-
- // 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)});
- }
-
-}
\ No newline at end of file
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/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 4f20c0d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
+++ /dev/null
@@ -1,817 +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.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);
- }
-
- public void testSelector02() {
- ICSSSelectorList list = createSelectorList("H\\\\, H\\1, H3");
- checkSelectorList(list, "H\\\\, H\\1, H3", 3, 0);
-
- ICSSSelector selector;
- ICSSSelectorItem item;
-
- selector = list.getSelector(0);
- checkSelector(selector, "H\\\\", 1, 1, 0);
-
- item = selector.getItem(0);
- checkSimpleSelector(item, "H\\\\", false, 0, 0, 0, 0);
-
- selector = list.getSelector(1);
- checkSelector(selector, "H\\1", 1, 1, 0);
-
- 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"});
- }
-
-
- 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);
- }
-}
\ No newline at end of file
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 74545d8..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
+++ /dev/null
@@ -1,217 +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.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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.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 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 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$
- }
-
- 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$
-}
\ No newline at end of file
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 a7acb9d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
+++ /dev/null
@@ -1,105 +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.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$
- }
-
- 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";
-}
\ No newline at end of file
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 718a28a..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
+++ /dev/null
@@ -1,261 +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.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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-import org.eclipse.wst.sse.core.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;
-
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/BUG73990_selector_unformatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/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/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/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/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 8e4a89a..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* primitive values */
-NUMBERS {
- NUMBER: 123.456;
- PERCENTAGE: 123.456%;
- EMS: 123.456em;
- EXS: 123.456ex;
- PX: 123.456px;
- 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/results/BUG73990_selector_formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/BUG73990_selector_formatted.css
deleted file mode 100644
index 6da6ff7..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/BUG73990_selector_formatted.css
+++ /dev/null
@@ -1,79 +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/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 a0debe5..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 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[3, 9] ({
-
- )
- CSSContextRegion--> LBRACE: 0-1/6,
-[9, 21] (color: white)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[21, 24] (
- )
- CSSContextRegion--> S: 0-3,
-[24, 25] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[25, 30] (
-
- )
- CSSContextRegion--> S: 0-5,
-[30, 54] (background-color : black)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-16/17, CSSContextRegion--> DECLARATION_SEPARATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_IDENT: 19-24,
-[54, 59] (
-
-)
- CSSContextRegion--> S: 0-5,
-[59, 60] (})
- CSSContextRegion--> RBRACE: 0-1,
-[60, 62] (
-)
- CSSContextRegion--> 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 736b010..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"))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> URI: 8-23,
-[23, 24] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[24, 26] (
-)
- CSSContextRegion--> S: 0-2,
-[26, 61] (@import /* comment */ url(hoge.css))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> COMMENT: 8-21/22, CSSContextRegion--> URI: 22-35,
-[61, 62] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[62, 64] (
-)
- CSSContextRegion--> S: 0-2,
-[64, 96] (@import "hoge.css" /* comment */)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> STRING: 8-18/19, CSSContextRegion--> COMMENT: 19-32,
-[96, 97] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[97, 99] (
-)
- CSSContextRegion--> S: 0-2,
-[99, 155] (@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 )
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> STRING: 8-18/19, CSSContextRegion--> UNKNOWN: 19-20, CSSContextRegion--> MEDIUM: 20-26, CSSContextRegion--> MEDIA_SEPARATOR: 26-27, CSSContextRegion--> MEDIUM: 27-33, CSSContextRegion--> MEDIA_SEPARATOR: 33-34, CSSContextRegion--> UNKNOWN: 34-35, CSSContextRegion--> MEDIUM: 35-41/42, CSSContextRegion--> UNKNOWN: 42-48, CSSContextRegion--> MEDIA_SEPARATOR: 48-49, CSSContextRegion--> MEDIUM: 49-55/56,
-[155, 169] (@import media6)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> UNKNOWN: 8-14,
-[169, 170] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[170, 221] (
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-)
- CSSContextRegion--> S: 0-4, CSSContextRegion--> CDO: 4-8/9, CSSContextRegion--> COMMENT: 9-23/27, CSSContextRegion--> CDC: 27-30/34, CSSContextRegion--> COMMENT: 34-49/51,
-[221, 227] (kuso
-)
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/6,
-
--------
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 233e4e6..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"))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> URI: 8-29,
-[29, 30] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[30, 57] (
-
-/* Sample Styles */
-
-)
- CSSContextRegion--> S: 0-4, CSSContextRegion--> COMMENT: 4-23/27,
-[57, 62] (BODY )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[62, 66] ({
- )
- CSSContextRegion--> LBRACE: 0-1/4,
-[66, 79] (color : black)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[79, 80] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[80, 83] (
- )
- CSSContextRegion--> S: 0-3,
-[83, 120] (background-color : rgb(181, 253, 211))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-16/17, CSSContextRegion--> DECLARATION_SEPARATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 23-26, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 28-31, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 33-36, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[120, 121] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[121, 124] (
- )
- CSSContextRegion--> S: 0-3,
-[124, 143] (text-align : center)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10/11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[143, 144] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[144, 147] (
- )
- CSSContextRegion--> S: 0-3,
-[147, 186] (font-family : "Heisei Mincho W3", serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-32, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, CSSContextRegion--> DECLARATION_VALUE_IDENT: 34-39,
-[186, 188] (
-)
- CSSContextRegion--> S: 0-2,
-[188, 189] (})
- CSSContextRegion--> RBRACE: 0-1,
-[189, 193] (
-
-)
- CSSContextRegion--> S: 0-4,
-[193, 205] (@page :left )
- CSSContextRegion--> PAGE: 0-5/6, CSSContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[205, 207] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[207, 224] (margin-left : 4cm)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[224, 225] ( )
- CSSContextRegion--> S: 0-1,
-[225, 226] (})
- CSSContextRegion--> RBRACE: 0-1,
-[226, 230] (
-
-)
- CSSContextRegion--> S: 0-4,
-[230, 243] (@media aural )
- CSSContextRegion--> MEDIA: 0-6/7, CSSContextRegion--> MEDIUM: 7-12/13,
-[243, 247] ({
- )
- CSSContextRegion--> LBRACE: 0-1/4,
-[247, 255] (P.heidi )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-7/8,
-[255, 260] ({
- )
- CSSContextRegion--> LBRACE: 0-1/5,
-[260, 281] (azimuth : center-left)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[281, 282] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[282, 286] (
- )
- CSSContextRegion--> S: 0-4,
-[286, 305] (elevation : 12.3deg)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9/10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[305, 306] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[306, 310] (
- )
- CSSContextRegion--> S: 0-4,
-[310, 327] (pause : 30ms 1.6s)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[327, 330] (
- )
- CSSContextRegion--> S: 0-3,
-[330, 331] (})
- CSSContextRegion--> RBRACE: 0-1,
-[331, 333] (
-)
- CSSContextRegion--> S: 0-2,
-[333, 334] (})
- CSSContextRegion--> RBRACE: 0-1,
-[334, 336] (
-)
- CSSContextRegion--> 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 4a6e72f..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")
- CSSContextRegion--> CHARSET: 0-8/9, CSSContextRegion--> STRING: 9-21,
-[21, 22] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- CSSContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> URI: 8-23,
-[49, 50] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- CSSContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> COMMENT: 8-21/22, CSSContextRegion--> URI: 22-35,
-[87, 88] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- CSSContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> STRING: 8-18/19, CSSContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- CSSContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> STRING: 8-18/19, CSSContextRegion--> MEDIUM: 19-25, CSSContextRegion--> MEDIA_SEPARATOR: 25-26, CSSContextRegion--> MEDIUM: 26-32/33, CSSContextRegion--> MEDIA_SEPARATOR: 33-34/35, CSSContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- CSSContextRegion--> S: 0-4,
-[171, 184] (@media print )
- CSSContextRegion--> MEDIA: 0-6/7, CSSContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- CSSContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- CSSContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- CSSContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- CSSContextRegion--> PAGE: 0-5/6, CSSContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- CSSContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- CSSContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- CSSContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_SEPARATOR: 2-3/4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, CSSContextRegion--> SELECTOR_SEPARATOR: 6-7/8, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- CSSContextRegion--> S: 0-2,
-[255, 256] (})
- CSSContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- CSSContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_COMBINATOR: 2-3, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- CSSContextRegion--> S: 0-2,
-[280, 281] (})
- CSSContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- CSSContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, CSSContextRegion--> SELECTOR_COMBINATOR: 3-4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, CSSContextRegion--> SELECTOR_COMBINATOR: 5-6, CSSContextRegion--> SELECTOR_UNIVERSAL: 6-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- CSSContextRegion--> S: 0-2,
-[313, 314] (})
- CSSContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- CSSContextRegion--> S: 0-2,
-[316, 325] (body > P )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, CSSContextRegion--> SELECTOR_COMBINATOR: 5-6/7, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- CSSContextRegion--> S: 0-2,
-[346, 347] (})
- CSSContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- CSSContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, CSSContextRegion--> SELECTOR_COMBINATOR: 3-4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, CSSContextRegion--> SELECTOR_COMBINATOR: 6-7, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, CSSContextRegion--> SELECTOR_COMBINATOR: 9-10, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- CSSContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- CSSContextRegion--> S: 0-2,
-[366, 375] (math + p )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, CSSContextRegion--> SELECTOR_COMBINATOR: 5-6/7, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- CSSContextRegion--> S: 0-2,
-[394, 395] (})
- CSSContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- CSSContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_CLASS: 2-9/10, CSSContextRegion--> SELECTOR_COMBINATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_IDENT: 12-16,
-[431, 433] ( )
- CSSContextRegion--> S: 0-2,
-[433, 434] (})
- CSSContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- CSSContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- CSSContextRegion--> S: 0-2,
-[463, 464] (})
- CSSContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- CSSContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- CSSContextRegion--> S: 0-2,
-[503, 504] (})
- CSSContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- CSSContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- CSSContextRegion--> S: 0-2,
-[567, 568] (})
- CSSContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- CSSContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- CSSContextRegion--> S: 0-2,
-[606, 607] (})
- CSSContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- CSSContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- CSSContextRegion--> S: 0-2,
-[654, 655] (})
- CSSContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- CSSContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- CSSContextRegion--> S: 0-2,
-[687, 688] (})
- CSSContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- CSSContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- CSSContextRegion--> S: 0-2,
-[720, 721] (})
- CSSContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- CSSContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-32, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, CSSContextRegion--> DECLARATION_VALUE_IDENT: 34-41, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, CSSContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- CSSContextRegion--> S: 0-2,
-[802, 803] (})
- CSSContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- CSSContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-28, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, CSSContextRegion--> DECLARATION_VALUE_IDENT: 30-38, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, CSSContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- CSSContextRegion--> S: 0-2,
-[888, 889] (})
- CSSContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- CSSContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- CSSContextRegion--> S: 0-2,
-[919, 920] (})
- CSSContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- CSSContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- CSSContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- CSSContextRegion--> S: 0-2,
-[949, 950] (})
- CSSContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- CSSContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- CSSContextRegion--> S: 0-2,
-[981, 982] (})
- CSSContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- CSSContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-10, CSSContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- CSSContextRegion--> S: 0-2,
-[1019, 1020] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- CSSContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- CSSContextRegion--> S: 0-2,
-[1057, 1058] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- CSSContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, CSSContextRegion--> SELECTOR_COMBINATOR: 4-5/6, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, CSSContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- CSSContextRegion--> S: 0-2,
-[1099, 1100] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- CSSContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13, CSSContextRegion--> SELECTOR_COMBINATOR: 13-14, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- CSSContextRegion--> S: 0-2,
-[1142, 1143] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- CSSContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, CSSContextRegion--> SELECTOR_COMBINATOR: 2-3/4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, CSSContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- CSSContextRegion--> S: 0-2,
-[1186, 1187] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- CSSContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- CSSContextRegion--> S: 0-2,
-[1226, 1227] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- CSSContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-10, CSSContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- CSSContextRegion--> S: 0-2,
-[1264, 1265] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- CSSContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-7, CSSContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- CSSContextRegion--> S: 0-2,
-[1303, 1304] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- CSSContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- CSSContextRegion--> S: 0-2,
-[1342, 1343] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- CSSContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, CSSContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, CSSContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- CSSContextRegion--> S: 0-2,
-[1397, 1398] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- CSSContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- CSSContextRegion--> SELECTOR_PSEUDO: 0-9/10, CSSContextRegion--> SELECTOR_COMBINATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- CSSContextRegion--> S: 0-2,
-[1436, 1437] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- CSSContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- CSSContextRegion--> SELECTOR_PSEUDO: 0-9/10, CSSContextRegion--> SELECTOR_COMBINATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, CSSContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, CSSContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- CSSContextRegion--> S: 0-2,
-[1491, 1492] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- CSSContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9, CSSContextRegion--> DECLARATION_SEPARATOR: 9-10/11, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- CSSContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- CSSContextRegion--> S: 0-2,
-[1549, 1550] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- CSSContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-9, CSSContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- CSSContextRegion--> S: 0-1,
-[1592, 1593] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- CSSContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-9, CSSContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- CSSContextRegion--> S: 0-1,
-[1635, 1636] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- CSSContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-24, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, CSSContextRegion--> DECLARATION_VALUE_STRING: 26-43, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, CSSContextRegion--> DECLARATION_VALUE_IDENT: 45-51, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, CSSContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- CSSContextRegion--> S: 0-1,
-[1704, 1705] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- CSSContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4, CSSContextRegion--> DECLARATION_SEPARATOR: 4-5/6, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, CSSContextRegion--> DECLARATION_VALUE_STRING: 20-38, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, CSSContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- CSSContextRegion--> S: 0-1,
-[1769, 1770] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- CSSContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4, CSSContextRegion--> DECLARATION_SEPARATOR: 4-5/6, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, CSSContextRegion--> DECLARATION_VALUE_STRING: 22-31, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, CSSContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- CSSContextRegion--> S: 0-1,
-[1827, 1828] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- CSSContextRegion--> 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 4a6e72f..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")
- CSSContextRegion--> CHARSET: 0-8/9, CSSContextRegion--> STRING: 9-21,
-[21, 22] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- CSSContextRegion--> S: 0-4,
-[26, 49] (@import url("hoge.css"))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> URI: 8-23,
-[49, 50] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[50, 52] (
-)
- CSSContextRegion--> S: 0-2,
-[52, 87] (@import /* comment */ url(hoge.css))
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> COMMENT: 8-21/22, CSSContextRegion--> URI: 22-35,
-[87, 88] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[88, 90] (
-)
- CSSContextRegion--> S: 0-2,
-[90, 122] (@import "hoge.css" /* comment */)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> STRING: 8-18/19, CSSContextRegion--> COMMENT: 19-32,
-[122, 123] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[123, 125] (
-)
- CSSContextRegion--> S: 0-2,
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> STRING: 8-18/19, CSSContextRegion--> MEDIUM: 19-25, CSSContextRegion--> MEDIA_SEPARATOR: 25-26, CSSContextRegion--> MEDIUM: 26-32/33, CSSContextRegion--> MEDIA_SEPARATOR: 33-34/35, CSSContextRegion--> MEDIUM: 35-41,
-[166, 167] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[167, 171] (
-
-)
- CSSContextRegion--> S: 0-4,
-[171, 184] (@media print )
- CSSContextRegion--> MEDIA: 0-6/7, CSSContextRegion--> MEDIUM: 7-12/13,
-[184, 189] ({
-
-)
- CSSContextRegion--> LBRACE: 0-1/5,
-[189, 190] (})
- CSSContextRegion--> RBRACE: 0-1,
-[190, 194] (
-
-)
- CSSContextRegion--> S: 0-4,
-[194, 206] (@page :left )
- CSSContextRegion--> PAGE: 0-5/6, CSSContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[206, 211] ({
-
-)
- CSSContextRegion--> LBRACE: 0-1/5,
-[211, 212] (})
- CSSContextRegion--> RBRACE: 0-1,
-[212, 216] (
-
-)
- CSSContextRegion--> S: 0-4,
-[216, 227] (h1, h2, h3 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_SEPARATOR: 2-3/4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, CSSContextRegion--> SELECTOR_SEPARATOR: 6-7/8, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11,
-[227, 230] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[230, 253] (font-family: sans-serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-23,
-[253, 255] ( )
- CSSContextRegion--> S: 0-2,
-[255, 256] (})
- CSSContextRegion--> RBRACE: 0-1,
-[256, 258] (
-)
- CSSContextRegion--> S: 0-2,
-[258, 264] (h1 em )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_COMBINATOR: 2-3, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6,
-[264, 267] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[267, 278] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[278, 280] ( )
- CSSContextRegion--> S: 0-2,
-[280, 281] (})
- CSSContextRegion--> RBRACE: 0-1,
-[281, 283] (
-)
- CSSContextRegion--> S: 0-2,
-[283, 297] (div p *[href] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, CSSContextRegion--> SELECTOR_COMBINATOR: 3-4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, CSSContextRegion--> SELECTOR_COMBINATOR: 5-6, CSSContextRegion--> SELECTOR_UNIVERSAL: 6-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[297, 300] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[300, 311] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[311, 313] ( )
- CSSContextRegion--> S: 0-2,
-[313, 314] (})
- CSSContextRegion--> RBRACE: 0-1,
-[314, 316] (
-)
- CSSContextRegion--> S: 0-2,
-[316, 325] (body > P )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, CSSContextRegion--> SELECTOR_COMBINATOR: 5-6/7, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[325, 328] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[328, 344] (line-height: 1.3)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 13-16,
-[344, 346] ( )
- CSSContextRegion--> S: 0-2,
-[346, 347] (})
- CSSContextRegion--> RBRACE: 0-1,
-[347, 349] (
-)
- CSSContextRegion--> S: 0-2,
-[349, 361] (div ol>li p )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, CSSContextRegion--> SELECTOR_COMBINATOR: 3-4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, CSSContextRegion--> SELECTOR_COMBINATOR: 6-7, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, CSSContextRegion--> SELECTOR_COMBINATOR: 9-10, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12,
-[361, 363] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[363, 364] (})
- CSSContextRegion--> RBRACE: 0-1,
-[364, 366] (
-)
- CSSContextRegion--> S: 0-2,
-[366, 375] (math + p )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, CSSContextRegion--> SELECTOR_COMBINATOR: 5-6/7, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9,
-[375, 378] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[378, 392] (text-indent: 0)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[392, 394] ( )
- CSSContextRegion--> S: 0-2,
-[394, 395] (})
- CSSContextRegion--> RBRACE: 0-1,
-[395, 397] (
-)
- CSSContextRegion--> S: 0-2,
-[397, 412] (h1.opener + h2 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_CLASS: 2-9/10, CSSContextRegion--> SELECTOR_COMBINATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15,
-[412, 415] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[415, 431] (margin-top: -5mm)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_IDENT: 12-16,
-[431, 433] ( )
- CSSContextRegion--> S: 0-2,
-[433, 434] (})
- CSSContextRegion--> RBRACE: 0-1,
-[434, 436] (
-)
- CSSContextRegion--> S: 0-2,
-[436, 446] (h1[title] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10,
-[446, 449] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[449, 460] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[460, 461] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[461, 463] ( )
- CSSContextRegion--> S: 0-2,
-[463, 464] (})
- CSSContextRegion--> RBRACE: 0-1,
-[464, 466] (
-)
- CSSContextRegion--> S: 0-2,
-[466, 486] (span[class=example] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[486, 489] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[489, 500] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[500, 501] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[501, 503] ( )
- CSSContextRegion--> S: 0-2,
-[503, 504] (})
- CSSContextRegion--> RBRACE: 0-1,
-[504, 506] (
-)
- CSSContextRegion--> S: 0-2,
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44,
-[550, 553] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[553, 564] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[564, 565] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[565, 567] ( )
- CSSContextRegion--> S: 0-2,
-[567, 568] (})
- CSSContextRegion--> RBRACE: 0-1,
-[568, 570] (
-)
- CSSContextRegion--> S: 0-2,
-[570, 590] (a[rel~="copyright"] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20,
-[590, 593] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[593, 604] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[604, 606] ( )
- CSSContextRegion--> S: 0-2,
-[606, 607] (})
- CSSContextRegion--> RBRACE: 0-1,
-[607, 609] (
-)
- CSSContextRegion--> S: 0-2,
-[609, 638] (a[href="http://www.w3.org/"] )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29,
-[638, 641] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[641, 652] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[652, 654] ( )
- CSSContextRegion--> S: 0-2,
-[654, 655] (})
- CSSContextRegion--> RBRACE: 0-1,
-[655, 657] (
-)
- CSSContextRegion--> S: 0-2,
-[657, 668] (*[lang=fr] )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11,
-[668, 671] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[671, 685] (display : none)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_IDENT: 10-14,
-[685, 687] ( )
- CSSContextRegion--> S: 0-2,
-[687, 688] (})
- CSSContextRegion--> RBRACE: 0-1,
-[688, 690] (
-)
- CSSContextRegion--> S: 0-2,
-[690, 704] (*[lang|="en"] )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14,
-[704, 707] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[707, 718] (color : red)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[718, 720] ( )
- CSSContextRegion--> S: 0-2,
-[720, 721] (})
- CSSContextRegion--> RBRACE: 0-1,
-[721, 723] (
-)
- CSSContextRegion--> S: 0-2,
-[723, 750] (DIALOGUE[character=romeo]
-)
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27,
-[750, 753] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-32, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, CSSContextRegion--> DECLARATION_VALUE_IDENT: 34-41, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, CSSContextRegion--> DECLARATION_VALUE_IDENT: 43-47,
-[800, 802] ( )
- CSSContextRegion--> S: 0-2,
-[802, 803] (})
- CSSContextRegion--> RBRACE: 0-1,
-[803, 805] (
-)
- CSSContextRegion--> S: 0-2,
-[805, 837] (DIALOGUE[ character = juliet ]
-)
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, CSSContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, CSSContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, CSSContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, CSSContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, CSSContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32,
-[837, 840] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-28, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, CSSContextRegion--> DECLARATION_VALUE_IDENT: 30-38, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, CSSContextRegion--> DECLARATION_VALUE_IDENT: 40-46,
-[886, 888] ( )
- CSSContextRegion--> S: 0-2,
-[888, 889] (})
- CSSContextRegion--> RBRACE: 0-1,
-[889, 891] (
-)
- CSSContextRegion--> S: 0-2,
-[891, 902] (*.pastoral )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-10/11,
-[902, 905] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[905, 917] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[917, 919] ( )
- CSSContextRegion--> S: 0-2,
-[919, 920] (})
- CSSContextRegion--> RBRACE: 0-1,
-[920, 922] (
-)
- CSSContextRegion--> S: 0-2,
-[922, 932] (.pastoral )
- CSSContextRegion--> SELECTOR_CLASS: 0-9/10,
-[932, 935] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[935, 947] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[947, 949] ( )
- CSSContextRegion--> S: 0-2,
-[949, 950] (})
- CSSContextRegion--> RBRACE: 0-1,
-[950, 952] (
-)
- CSSContextRegion--> S: 0-2,
-[952, 964] (H1.pastoral )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_CLASS: 2-11/12,
-[964, 967] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[967, 979] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[979, 981] ( )
- CSSContextRegion--> S: 0-2,
-[981, 982] (})
- CSSContextRegion--> RBRACE: 0-1,
-[982, 984] (
-)
- CSSContextRegion--> S: 0-2,
-[984, 1002] (p.pastoral.marine )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-10, CSSContextRegion--> SELECTOR_CLASS: 10-17/18,
-[1002, 1005] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1005, 1017] (color: green)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-12,
-[1017, 1019] ( )
- CSSContextRegion--> S: 0-2,
-[1019, 1020] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1020, 1022] (
-)
- CSSContextRegion--> S: 0-2,
-[1022, 1034] (h1#chapter1 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_ID: 2-11/12,
-[1034, 1037] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1037, 1055] (text-align: center)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_IDENT: 12-18,
-[1055, 1057] ( )
- CSSContextRegion--> S: 0-2,
-[1057, 1058] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1058, 1060] (
-)
- CSSContextRegion--> S: 0-2,
-[1060, 1080] (div > p:first-child )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, CSSContextRegion--> SELECTOR_COMBINATOR: 4-5/6, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, CSSContextRegion--> SELECTOR_PSEUDO: 7-19/20,
-[1080, 1083] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1083, 1097] (text-indent: 0)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 13-14,
-[1097, 1099] ( )
- CSSContextRegion--> S: 0-2,
-[1099, 1100] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1100, 1102] (
-)
- CSSContextRegion--> S: 0-2,
-[1102, 1119] (p:first-child em )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13, CSSContextRegion--> SELECTOR_COMBINATOR: 13-14, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17,
-[1119, 1122] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1122, 1140] (font-weight : bold)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1140, 1142] ( )
- CSSContextRegion--> S: 0-2,
-[1142, 1143] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1143, 1145] (
-)
- CSSContextRegion--> S: 0-2,
-[1145, 1163] (* > a:first-child )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, CSSContextRegion--> SELECTOR_COMBINATOR: 2-3/4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, CSSContextRegion--> SELECTOR_PSEUDO: 5-17/18,
-[1163, 1166] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1166, 1184] (font-weight : bold)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1184, 1186] ( )
- CSSContextRegion--> S: 0-2,
-[1186, 1187] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1187, 1189] (
-)
- CSSContextRegion--> S: 0-2,
-[1189, 1203] (a:first-child )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1203, 1206] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1206, 1224] (font-weight : bold)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_IDENT: 14-18,
-[1224, 1226] ( )
- CSSContextRegion--> S: 0-2,
-[1226, 1227] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1227, 1229] (
-)
- CSSContextRegion--> S: 0-2,
-[1229, 1248] (a.external:visited )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-10, CSSContextRegion--> SELECTOR_PSEUDO: 10-18/19,
-[1248, 1251] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1251, 1262] (color: blue)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_IDENT: 7-11,
-[1262, 1264] ( )
- CSSContextRegion--> S: 0-2,
-[1264, 1265] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1265, 1267] (
-)
- CSSContextRegion--> S: 0-2,
-[1267, 1281] (a:focus:hover )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-7, CSSContextRegion--> SELECTOR_PSEUDO: 7-13/14,
-[1281, 1284] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1284, 1301] (background: white)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_IDENT: 12-17,
-[1301, 1303] ( )
- CSSContextRegion--> S: 0-2,
-[1303, 1304] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1304, 1306] (
-)
- CSSContextRegion--> S: 0-2,
-[1306, 1320] (html:lang(fr) )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1320, 1323] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1323, 1340] (quotes: '<<' '>>')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1340, 1342] ( )
- CSSContextRegion--> S: 0-2,
-[1342, 1343] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1343, 1345] (
-)
- CSSContextRegion--> S: 0-2,
-[1345, 1359] (html:lang(de) )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, CSSContextRegion--> SELECTOR_PSEUDO: 4-13/14,
-[1359, 1362] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, CSSContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, CSSContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1395, 1397] ( )
- CSSContextRegion--> S: 0-2,
-[1397, 1398] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1398, 1400] (
-)
- CSSContextRegion--> S: 0-2,
-[1400, 1414] (:lang(fr) > Q )
- CSSContextRegion--> SELECTOR_PSEUDO: 0-9/10, CSSContextRegion--> SELECTOR_COMBINATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1414, 1417] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1417, 1434] (quotes: '<<' '>>')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17,
-[1434, 1436] ( )
- CSSContextRegion--> S: 0-2,
-[1436, 1437] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1437, 1439] (
-)
- CSSContextRegion--> S: 0-2,
-[1439, 1453] (:lang(de) > Q )
- CSSContextRegion--> SELECTOR_PSEUDO: 0-9/10, CSSContextRegion--> SELECTOR_COMBINATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14,
-[1453, 1456] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, CSSContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, CSSContextRegion--> DECLARATION_VALUE_STRING: 26-33,
-[1489, 1491] ( )
- CSSContextRegion--> S: 0-2,
-[1491, 1492] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1492, 1494] (
-)
- CSSContextRegion--> S: 0-2,
-[1494, 1509] (p:first-letter )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-14/15,
-[1509, 1512] ({ )
- CSSContextRegion--> LBRACE: 0-1/3,
-[1512, 1526] (font-size: 3em)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9, CSSContextRegion--> DECLARATION_SEPARATOR: 9-10/11, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14,
-[1526, 1527] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1527, 1528] ( )
- CSSContextRegion--> S: 0-1,
-[1528, 1547] (font-weight: normal)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[1547, 1549] ( )
- CSSContextRegion--> S: 0-2,
-[1549, 1550] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1550, 1552] (
-)
- CSSContextRegion--> S: 0-2,
-[1552, 1569] (p.special:before )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-9, CSSContextRegion--> SELECTOR_PSEUDO: 9-16/17,
-[1569, 1571] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1571, 1591] (content: "Special! ")
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_STRING: 9-20,
-[1591, 1592] ( )
- CSSContextRegion--> S: 0-1,
-[1592, 1593] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1593, 1595] (
-)
- CSSContextRegion--> S: 0-2,
-[1595, 1618] (p.special:first-letter )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-9, CSSContextRegion--> SELECTOR_PSEUDO: 9-22/23,
-[1618, 1620] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1620, 1634] (color: #ffd800)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[1634, 1635] ( )
- CSSContextRegion--> S: 0-1,
-[1635, 1636] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1636, 1638] (
-)
- CSSContextRegion--> S: 0-2,
-[1638, 1643] (BODY )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[1643, 1645] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-24, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, CSSContextRegion--> DECLARATION_VALUE_STRING: 26-43, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, CSSContextRegion--> DECLARATION_VALUE_IDENT: 45-51, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, CSSContextRegion--> DECLARATION_VALUE_IDENT: 53-58,
-[1703, 1704] ( )
- CSSContextRegion--> S: 0-1,
-[1704, 1705] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1705, 1707] (
-)
- CSSContextRegion--> S: 0-2,
-[1707, 1721] (*:lang(ja-jp) )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1721, 1723] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4, CSSContextRegion--> DECLARATION_SEPARATOR: 4-5/6, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, CSSContextRegion--> DECLARATION_VALUE_STRING: 20-38, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, CSSContextRegion--> DECLARATION_VALUE_IDENT: 40-45,
-[1768, 1769] ( )
- CSSContextRegion--> S: 0-1,
-[1769, 1770] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1770, 1772] (
-)
- CSSContextRegion--> S: 0-2,
-[1772, 1786] (*:lang(zh-tw) )
- CSSContextRegion--> SELECTOR_UNIVERSAL: 0-1, CSSContextRegion--> SELECTOR_PSEUDO: 1-13/14,
-[1786, 1788] ({ )
- CSSContextRegion--> LBRACE: 0-1/2,
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4, CSSContextRegion--> DECLARATION_SEPARATOR: 4-5/6, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, CSSContextRegion--> DECLARATION_VALUE_STRING: 22-31, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, CSSContextRegion--> DECLARATION_VALUE_IDENT: 33-38,
-[1826, 1827] ( )
- CSSContextRegion--> S: 0-1,
-[1827, 1828] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1828, 1830] (
-)
- CSSContextRegion--> 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 eafcb31..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 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-11/12,
-[12, 16] ({
- )
- CSSContextRegion--> LBRACE: 0-1/4,
-[16, 33] (dimension : 100ex)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9/10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 12-17,
-[33, 34] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[34, 37] (
- )
- CSSContextRegion--> S: 0-3,
-[37, 133] (function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright"))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-8/9, CSSContextRegion--> DECLARATION_SEPARATOR: 9-10/11, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 11-16, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 16-19, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 21-24, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 26-29, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 31-34, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 34-35, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 35-36/37, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 37-44, CSSContextRegion--> DECLARATION_VALUE_STRING: 44-57, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 57-58, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 58-59/60, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 60-66, CSSContextRegion--> DECLARATION_VALUE_STRING: 66-95, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 95-96,
-[133, 134] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[134, 137] (
- )
- CSSContextRegion--> S: 0-3,
-[137, 151] (hash : #aabbcc)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4/5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_HASH: 7-14,
-[151, 152] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[152, 155] (
- )
- CSSContextRegion--> S: 0-3,
-[155, 166] (ident : any)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-11,
-[166, 167] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[167, 170] (
- )
- CSSContextRegion--> S: 0-3,
-[170, 184] (number : 99999)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6/7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 9-14,
-[184, 185] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[185, 188] (
- )
- CSSContextRegion--> S: 0-3,
-[188, 205] (percentage : 100%)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10/11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_PERCENTAGE: 13-17,
-[205, 206] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[206, 209] (
- )
- CSSContextRegion--> S: 0-3,
-[209, 226] (string : "string")
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6/7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_STRING: 9-17,
-[226, 227] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[227, 230] (
- )
- CSSContextRegion--> S: 0-3,
-[230, 268] (unicode-range : U+??, U+100-220, U+4??)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-13/14, CSSContextRegion--> DECLARATION_SEPARATOR: 14-15/16, CSSContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, CSSContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, CSSContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[268, 269] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[269, 271] (
-)
- CSSContextRegion--> S: 0-2,
-[271, 272] (})
- CSSContextRegion--> RBRACE: 0-1,
-[272, 274] (
-)
- CSSContextRegion--> 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 7480b00..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")
- CSSContextRegion--> CHARSET: 0-8/9, CSSContextRegion--> STRING: 9-21,
-[21, 22] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[22, 26] (
-
-)
- CSSContextRegion--> S: 0-4,
-[26, 70] (@import url("../sample2.css") projection, tv)
- CSSContextRegion--> IMPORT: 0-7/8, CSSContextRegion--> URI: 8-29/30, CSSContextRegion--> MEDIUM: 30-40, CSSContextRegion--> MEDIA_SEPARATOR: 40-41/42, CSSContextRegion--> MEDIUM: 42-44,
-[70, 71] (;)
- CSSContextRegion--> DELIMITER: 0-1,
-[71, 75] (
-
-)
- CSSContextRegion--> S: 0-4,
-[75, 80] (BODY )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5,
-[80, 87] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[87, 100] (color : black)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[100, 101] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[101, 107] (
- )
- CSSContextRegion--> S: 0-6,
-[107, 126] (text-align : center)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10/11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[126, 127] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[127, 133] (
- )
- CSSContextRegion--> S: 0-6,
-[133, 172] (background-color : rgb( 181, 253, 211 ))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-16/17, CSSContextRegion--> DECLARATION_SEPARATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23/24, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 34-37/38, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39,
-[172, 174] (
-)
- CSSContextRegion--> S: 0-2,
-[174, 175] (})
- CSSContextRegion--> RBRACE: 0-1,
-[175, 179] (
-
-)
- CSSContextRegion--> S: 0-4,
-[179, 182] (UL )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[182, 189] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[189, 202] (color : black)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[202, 203] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[203, 209] (
- )
- CSSContextRegion--> S: 0-6,
-[209, 251] (list-style-image : url("images/l_a01.gif"))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-16/17, CSSContextRegion--> DECLARATION_SEPARATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_URI: 19-42,
-[251, 252] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[252, 258] (
- )
- CSSContextRegion--> S: 0-6,
-[258, 287] (list-style-position : outside)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-19/20, CSSContextRegion--> DECLARATION_SEPARATOR: 20-21/22, CSSContextRegion--> DECLARATION_VALUE_IDENT: 22-29,
-[287, 289] (
-)
- CSSContextRegion--> S: 0-2,
-[289, 290] (})
- CSSContextRegion--> RBRACE: 0-1,
-[290, 294] (
-
-)
- CSSContextRegion--> S: 0-4,
-[294, 297] (H1 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3,
-[297, 304] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[304, 317] (color : white)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_IDENT: 8-13,
-[317, 318] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[318, 324] (
- )
- CSSContextRegion--> S: 0-6,
-[324, 343] (text-align : center)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10/11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-19,
-[343, 344] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[344, 350] (
- )
- CSSContextRegion--> S: 0-6,
-[350, 377] (border-left-color : #996666)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-17/18, CSSContextRegion--> DECLARATION_SEPARATOR: 18-19/20, CSSContextRegion--> DECLARATION_VALUE_HASH: 20-27,
-[377, 378] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[378, 384] (
- )
- CSSContextRegion--> S: 0-6,
-[384, 401] (padding-top : 0px)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[401, 402] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[402, 408] (
- )
- CSSContextRegion--> S: 0-6,
-[408, 427] (padding-right : 1cm)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-13/14, CSSContextRegion--> DECLARATION_SEPARATOR: 14-15/16, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19,
-[427, 428] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[428, 434] (
- )
- CSSContextRegion--> S: 0-6,
-[434, 452] (padding-bottom : 2)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-14/15, CSSContextRegion--> DECLARATION_SEPARATOR: 15-16/17, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 17-18,
-[452, 453] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[453, 459] (
- )
- CSSContextRegion--> S: 0-6,
-[459, 477] (padding-left : 3em)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12/13, CSSContextRegion--> DECLARATION_SEPARATOR: 13-14/15, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 15-18,
-[477, 478] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[478, 484] (
- )
- CSSContextRegion--> S: 0-6,
-[484, 504] (border-style : solid)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12/13, CSSContextRegion--> DECLARATION_SEPARATOR: 13-14/15, CSSContextRegion--> DECLARATION_VALUE_IDENT: 15-20,
-[504, 505] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[505, 511] (
- )
- CSSContextRegion--> S: 0-6,
-[511, 535] (border-top-width : 4.5ex)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-16/17, CSSContextRegion--> DECLARATION_SEPARATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 19-24,
-[535, 536] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[536, 542] (
- )
- CSSContextRegion--> S: 0-6,
-[542, 566] (border-right-width : 5in)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-18/19, CSSContextRegion--> DECLARATION_SEPARATOR: 19-20/21, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 21-24,
-[566, 567] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[567, 573] (
- )
- CSSContextRegion--> S: 0-6,
-[573, 601] (border-bottom-width : 6.02mm)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-19/20, CSSContextRegion--> DECLARATION_SEPARATOR: 20-21/22, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 22-28,
-[601, 602] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[602, 608] (
- )
- CSSContextRegion--> S: 0-6,
-[608, 629] (border-left-width : 7)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-17/18, CSSContextRegion--> DECLARATION_SEPARATOR: 18-19/20, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 20-21,
-[629, 631] (
-)
- CSSContextRegion--> S: 0-2,
-[631, 632] (})
- CSSContextRegion--> RBRACE: 0-1,
-[632, 636] (
-
-)
- CSSContextRegion--> S: 0-4,
-[636, 646] (H1:before )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_PSEUDO: 2-9/10,
-[646, 653] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[653, 697] (content : "Chapter " counter( chapter ) ". ")
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_STRING: 10-20/21, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 21-29/30, CSSContextRegion--> DECLARATION_VALUE_IDENT: 30-37/38, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39/40, CSSContextRegion--> DECLARATION_VALUE_STRING: 40-44,
-[697, 698] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[698, 704] (
- )
- CSSContextRegion--> S: 0-6,
-[704, 731] (counter-increment : chapter)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-17/18, CSSContextRegion--> DECLARATION_SEPARATOR: 18-19/20, CSSContextRegion--> DECLARATION_VALUE_IDENT: 20-27,
-[731, 732] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[732, 738] (
- )
- CSSContextRegion--> S: 0-6,
-[738, 761] (counter-reset : section)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-13/14, CSSContextRegion--> DECLARATION_SEPARATOR: 14-15/16, CSSContextRegion--> DECLARATION_VALUE_IDENT: 16-23,
-[761, 763] (
-)
- CSSContextRegion--> S: 0-2,
-[763, 764] (})
- CSSContextRegion--> RBRACE: 0-1,
-[764, 768] (
-
-)
- CSSContextRegion--> S: 0-4,
-[768, 779] (IMG:before )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, CSSContextRegion--> SELECTOR_PSEUDO: 3-10/11,
-[779, 780] ({)
- CSSContextRegion--> LBRACE: 0-1,
-[780, 799] (content : attr(alt))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 10-15, CSSContextRegion--> DECLARATION_VALUE_IDENT: 15-18, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 18-19,
-[799, 800] (})
- CSSContextRegion--> RBRACE: 0-1,
-[800, 804] (
-
-)
- CSSContextRegion--> S: 0-4,
-[804, 815] (DIV.sample )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, CSSContextRegion--> SELECTOR_CLASS: 3-10/11,
-[815, 822] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[822, 863] (font-family : "Robson Celtic", sans-serif)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-29, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, CSSContextRegion--> DECLARATION_VALUE_IDENT: 31-41,
-[863, 864] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[864, 870] (
- )
- CSSContextRegion--> S: 0-6,
-[870, 889] (position : absolute)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-8/9, CSSContextRegion--> DECLARATION_SEPARATOR: 9-10/11, CSSContextRegion--> DECLARATION_VALUE_IDENT: 11-19,
-[889, 890] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[890, 896] (
- )
- CSSContextRegion--> S: 0-6,
-[896, 910] (left : 833.5pc)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4/5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 7-14,
-[910, 911] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[911, 917] (
- )
- CSSContextRegion--> S: 0-6,
-[917, 926] (top : 90%)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-3/4, CSSContextRegion--> DECLARATION_SEPARATOR: 4-5/6, CSSContextRegion--> DECLARATION_VALUE_PERCENTAGE: 6-9,
-[926, 927] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[927, 933] (
- )
- CSSContextRegion--> S: 0-6,
-[933, 946] (width : 100pt)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[946, 947] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[947, 953] (
- )
- CSSContextRegion--> S: 0-6,
-[953, 971] (height : 110.777px)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6/7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 9-18,
-[971, 972] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[972, 978] (
- )
- CSSContextRegion--> S: 0-6,
-[978, 1015] (clip : rect( -5px, 80px, 130px, 0px ))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-4/5, CSSContextRegion--> DECLARATION_SEPARATOR: 5-6/7, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 7-12/13, CSSContextRegion--> DECLARATION_VALUE_IDENT: 13-17, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 19-23, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 23-24/25, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 25-30, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 30-31/32, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 32-35/36, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37,
-[1015, 1017] (
-)
- CSSContextRegion--> S: 0-2,
-[1017, 1018] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1018, 1022] (
-
-)
- CSSContextRegion--> S: 0-4,
-[1022, 1033] (@font-face )
- CSSContextRegion--> FONT_FACE: 0-10/11,
-[1033, 1040] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[1040, 1065] (font-family : "Swiss 721")
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_STRING: 14-25,
-[1065, 1066] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1066, 1072] (
- )
- CSSContextRegion--> S: 0-6,
-[1072, 1158] (src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright"))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-3/4, CSSContextRegion--> DECLARATION_SEPARATOR: 4-5/6, CSSContextRegion--> DECLARATION_VALUE_URI: 6-26/27, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 27-34, CSSContextRegion--> DECLARATION_VALUE_STRING: 34-47, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 47-48, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 48-49/50, CSSContextRegion--> DECLARATION_VALUE_FUNCTION: 50-56, CSSContextRegion--> DECLARATION_VALUE_STRING: 56-85, CSSContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 85-86,
-[1158, 1159] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1159, 1165] (
- )
- CSSContextRegion--> S: 0-6,
-[1165, 1203] (unicode-range : U+??, U+100-220, U+4??)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-13/14, CSSContextRegion--> DECLARATION_SEPARATOR: 14-15/16, CSSContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, CSSContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, CSSContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38,
-[1203, 1204] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1204, 1210] (
- )
- CSSContextRegion--> S: 0-6,
-[1210, 1247] (font-weight : 100, 200, 300, 400, 500)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 14-17, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 19-22, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 22-23/24, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 34-37,
-[1247, 1249] (
-)
- CSSContextRegion--> S: 0-2,
-[1249, 1250] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1250, 1254] (
-
-)
- CSSContextRegion--> S: 0-4,
-[1254, 1266] (@page :left )
- CSSContextRegion--> PAGE: 0-5/6, CSSContextRegion--> CSS_PAGE_SELECTOR: 6-11/12,
-[1266, 1267] ({)
- CSSContextRegion--> LBRACE: 0-1,
-[1267, 1284] (margin-left : 4cm)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-11/12, CSSContextRegion--> DECLARATION_SEPARATOR: 12-13/14, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17,
-[1284, 1285] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1285, 1289] (
-
-)
- CSSContextRegion--> S: 0-4,
-[1289, 1302] (@media aural )
- CSSContextRegion--> MEDIA: 0-6/7, CSSContextRegion--> MEDIUM: 7-12/13,
-[1302, 1309] ({
- )
- CSSContextRegion--> LBRACE: 0-1/7,
-[1309, 1332] (H1, H2, H3, H4, H5, H6 )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, CSSContextRegion--> SELECTOR_SEPARATOR: 2-3/4, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, CSSContextRegion--> SELECTOR_SEPARATOR: 6-7/8, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 8-10, CSSContextRegion--> SELECTOR_SEPARATOR: 10-11/12, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 12-14, CSSContextRegion--> SELECTOR_SEPARATOR: 14-15/16, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 16-18, CSSContextRegion--> SELECTOR_SEPARATOR: 18-19/20, CSSContextRegion--> SELECTOR_ELEMENT_NAME: 20-22/23,
-[1332, 1343] ({
- )
- CSSContextRegion--> LBRACE: 0-1/11,
-[1343, 1369] (voice-family : paul, child)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-12/13, CSSContextRegion--> DECLARATION_SEPARATOR: 13-14/15, CSSContextRegion--> DECLARATION_VALUE_IDENT: 15-19, CSSContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, CSSContextRegion--> DECLARATION_VALUE_IDENT: 21-26,
-[1369, 1370] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1370, 1380] (
- )
- CSSContextRegion--> S: 0-10,
-[1380, 1391] (stress : 20)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6/7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 9-11,
-[1391, 1392] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1392, 1402] (
- )
- CSSContextRegion--> S: 0-10,
-[1402, 1415] (richness : 90)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-8/9, CSSContextRegion--> DECLARATION_SEPARATOR: 9-10/11, CSSContextRegion--> DECLARATION_VALUE_NUMBER: 11-13,
-[1415, 1416] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1416, 1426] (
- )
- CSSContextRegion--> S: 0-10,
-[1426, 1453] (cue-before : url("ping.au"))
- CSSContextRegion--> DECLARATION_PROPERTY: 0-10/11, CSSContextRegion--> DECLARATION_SEPARATOR: 11-12/13, CSSContextRegion--> DECLARATION_VALUE_URI: 13-27,
-[1453, 1459] (
- )
- CSSContextRegion--> S: 0-6,
-[1459, 1460] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1460, 1466] (
- )
- CSSContextRegion--> S: 0-6,
-[1466, 1474] (P.heidi )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1474, 1485] ({
- )
- CSSContextRegion--> LBRACE: 0-1/11,
-[1485, 1506] (azimuth : center-left)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_IDENT: 10-21,
-[1506, 1507] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1507, 1517] (
- )
- CSSContextRegion--> S: 0-10,
-[1517, 1536] (elevation : 12.3deg)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9/10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19,
-[1536, 1537] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1537, 1547] (
- )
- CSSContextRegion--> S: 0-10,
-[1547, 1564] (pause : 30ms 1.6s)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17,
-[1564, 1570] (
- )
- CSSContextRegion--> S: 0-6,
-[1570, 1571] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1571, 1577] (
- )
- CSSContextRegion--> S: 0-6,
-[1577, 1585] (P.peter )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-7/8,
-[1585, 1596] ({
- )
- CSSContextRegion--> LBRACE: 0-1/11,
-[1596, 1611] (azimuth : right)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-7/8, CSSContextRegion--> DECLARATION_SEPARATOR: 8-9/10, CSSContextRegion--> DECLARATION_VALUE_IDENT: 10-15,
-[1611, 1612] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1612, 1622] (
- )
- CSSContextRegion--> S: 0-10,
-[1622, 1642] (elevation : -0.36rad)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9/10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 12-20,
-[1642, 1643] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1643, 1653] (
- )
- CSSContextRegion--> S: 0-10,
-[1653, 1666] (pitch : 210Hz)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13,
-[1666, 1672] (
- )
- CSSContextRegion--> S: 0-6,
-[1672, 1673] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1673, 1679] (
- )
- CSSContextRegion--> S: 0-6,
-[1679, 1686] (P.goat )
- CSSContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, CSSContextRegion--> SELECTOR_CLASS: 1-6/7,
-[1686, 1697] ({
- )
- CSSContextRegion--> LBRACE: 0-1/11,
-[1697, 1712] (volume : x-soft)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-6/7, CSSContextRegion--> DECLARATION_SEPARATOR: 7-8/9, CSSContextRegion--> DECLARATION_VALUE_IDENT: 9-15,
-[1712, 1713] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1713, 1723] (
- )
- CSSContextRegion--> S: 0-10,
-[1723, 1741] (elevation : 66grad)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-9/10, CSSContextRegion--> DECLARATION_SEPARATOR: 10-11/12, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 12-18,
-[1741, 1742] (;)
- CSSContextRegion--> DECLARATION_DELIMITER: 0-1,
-[1742, 1752] (
- )
- CSSContextRegion--> S: 0-10,
-[1752, 1767] (pitch : 0.17kHz)
- CSSContextRegion--> DECLARATION_PROPERTY: 0-5/6, CSSContextRegion--> DECLARATION_SEPARATOR: 6-7/8, CSSContextRegion--> DECLARATION_VALUE_DIMENSION: 8-15,
-[1767, 1773] (
- )
- CSSContextRegion--> S: 0-6,
-[1773, 1774] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1774, 1776] (
-)
- CSSContextRegion--> S: 0-2,
-[1776, 1777] (})
- CSSContextRegion--> RBRACE: 0-1,
-[1777, 1781] (
-
-)
- CSSContextRegion--> S: 0-4,
-
--------
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 5bb3f2b..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_IDENT - 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 5bb3f2b..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_IDENT - 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 74b3076..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_IDENT - 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/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/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 db8c91d..0000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,103 +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.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.Platform;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-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 = Platform.asLocalURL(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();
- }
-}
\ No newline at end of file
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 ad9b2fd..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, 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
- * 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/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml
deleted file mode 100644
index c7b2786..0000000
--- a/tests/org.eclipse.wst.css.core.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.css.core.tests" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- 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.css.core.tests.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.css.core.tests.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!-- <emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </target>
-
-</project>
\ 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 065ac06..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 06101b9..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-cssencodingtests.jar
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.jdt.core.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3217eb3..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:47:34 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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 1ab65c5..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = plugin.xml,\
- cssencodingtests.jar,\
- testfiles/,\
- test.xml
-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.xml b/tests/org.eclipse.wst.css.tests.encoding/plugin.xml
deleted file mode 100644
index 8fc2c3f..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.css.tests.encoding"
- name="CSS Encoding Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin">
-
- <runtime>
- <library name="cssencodingtests.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.css.core"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.wst.sse.core"/>
- </requires>
-
-</plugin>
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 2ddaf31..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
+++ /dev/null
@@ -1,55 +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.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;
-
-public class CSSEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{CSSEncodingTester.class, CSSHeadTokenizerTester.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);
- }
-}
\ No newline at end of file
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 b0788b9..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +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.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.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");
- }
- else {
- 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 = Platform.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;
- }
-
-}
\ No newline at end of file
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 fd21c23..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
+++ /dev/null
@@ -1,171 +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.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 = encodingMemento = 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());
- }
-
-}
\ No newline at end of file
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 eb5a3d6..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
+++ /dev/null
@@ -1,143 +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.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 {
- private boolean DEBUG = false;
- private String fcharset;
- private final String fileDir = "css/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
-
- private void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
- CSSHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = CSSEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new CSSHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- throw e;
- }
-
- HeadParserToken resultToken = null;
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = 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) {
- if (tokenType == null)
- return false;
- else
- return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
-
- /**
- * 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 (tokenType == CSSHeadTokenizerConstants.CHARSET_RULE) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fcharset = valueToken.getText();
-
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- finalToken = token;
- return finalToken;
-
- }
-
- public void testBestCase() throws IOException {
- String filename = fileLocation + "nonStandard.css";
- doTestFile(filename, "ISO-8859-6");
-
- }
-
- public void testEmptyFile() throws IOException {
- String filename = fileLocation + "emptyFile.css";
- doTestFile(filename, null);
- }
-
- public void testEUCJP() throws IOException {
- String filename = fileLocation + "encoding_test_eucjp.css";
- doTestFile(filename, "EUC-JP");
- }
-
- public void testJIS() throws IOException {
- String filename = fileLocation + "encoding_test_jis.css";
- doTestFile(filename, "ISO-2022-JP");
- }
-
- public void testNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.css";
- doTestFile(filename, null);
- }
-
- public void testnonStandardIllFormed() throws IOException {
- String filename = fileLocation + "nonStandardIllFormed.css";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testnonStandardIllFormed2() throws IOException {
- String filename = fileLocation + "nonStandardIllFormed2.css";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testShiftJIS() throws IOException {
- String filename = fileLocation + "encoding_test_sjis.css";
- doTestFile(filename, "SHIFT_JIS");
- }
-}
\ No newline at end of file
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 cc60cd8..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, 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
- * 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/test.xml b/tests/org.eclipse.wst.css.tests.encoding/test.xml
deleted file mode 100644
index 2be68ff..0000000
--- a/tests/org.eclipse.wst.css.tests.encoding/test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- 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}\..\.." /> -->
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.css.tests.encoding" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.css.tests.encoding.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true" />
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="org.eclipse.wst.css.tests.encoding" />
- <property name="classname" value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.css.tests.encoding.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!--<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </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.html.tests.encoding/.classpath b/tests/org.eclipse.wst.html.tests.encoding/.classpath
deleted file mode 100644
index 065ac06..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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 2048e2a..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-htmlencodingtests.jar
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.jdt.core.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8df4d83..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:48:30 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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 3255704..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.htmlencodingtests.jar = src/
-output.htmlencodingtests.jar = bin/
-bin.includes = plugin.xml,\
- htmlencodingtests.jar,\
- testfiles/,\
- test.xml
-src.includes = plugin.xml,\
- testfiles/
diff --git a/tests/org.eclipse.wst.html.tests.encoding/plugin.xml b/tests/org.eclipse.wst.html.tests.encoding/plugin.xml
deleted file mode 100644
index 77dab2e..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.html.tests.encoding"
- name="HTML Encoding Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin">
-
- <runtime>
- <library name="htmlencodingtests.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.html.core"/>
- <import plugin="org.eclipse.wst.xml.core"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.wst.sse.core"/>
- </requires>
-
-</plugin>
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 c8b52ce..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
+++ /dev/null
@@ -1,55 +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.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;
-
-public class HTMLEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{HTMLEncodingTests.class, HTMLHeadTokenizerTester.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);
- }
-}
\ No newline at end of file
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 b31bdae..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +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.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.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");
- }
- else {
- 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 = Platform.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;
- }
-
-}
\ No newline at end of file
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 b29e1ea..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
+++ /dev/null
@@ -1,168 +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.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;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLResourceEncodingDetector;
-
-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 = 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 XMLResourceEncodingDetector());
- }
-
- 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());
- }
-
-}
\ No newline at end of file
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 4760b43..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,253 +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.html.tests.encoding.html;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-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;
-
-public class HTMLHeadTokenizerTester extends TestCase {
- private boolean DEBUG = false;
- private String fCharset;
-
- private String fContentTypeValue;
- private final String fileDir = "html/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + 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) throws IOException {
- HTMLHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = HTMLEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new HTMLHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- 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 (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- private boolean isLegalString(String tokenType) {
- if (tokenType == null)
- return false;
- else
- return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
-
- 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()) {
- fCharset = parts[0].substring(eqpos);
- fCharset = fCharset.trim();
- }
- }
- }
- }
- else {
- // fContentType = parts[0];
- }
-
- }
- if (parts.length > 1) {
- fCharset = parts[1];
- }
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(HTMLHeadTokenizer tokenizer) throws IOException {
- fPageEncodingValue = null;
- 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 (DEBUG) {
- System.out.println(token);
- }
- String tokenType = token.getType();
- if (tokenType == HTMLHeadTokenizerConstants.MetaTagContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- if (DEBUG) {
- System.out.println(valueToken);
- }
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fContentTypeValue = valueToken.getText();
-
- }
- }
- }
-
- }
- while (tokenizer.hasMoreTokens());
- if (fContentTypeValue != null) {
- parseContentTypeValue(fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
-
- }
-
- public void testBestCase() throws IOException {
- String filename = 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 = fileLocation + "EmptyFile.html";
- doTestFile(filename, null);
- }
-
- public void testIllFormedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.html";
- doTestFile(filename, "UTF-8");
- }
-
- public void testLargeCase() throws IOException {
- String filename = fileLocation + "LargeNonDefault.html";
- doTestFile(filename, "ISO-8859-1");
-
- }
-
- public void testLargeNoEncoding() throws IOException {
- String filename = fileLocation + "LargeNoEncoding.html";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
-
- }
-
- public void testMultiNonDefault() throws IOException {
- String filename = fileLocation + "MultiNonDefault.html";
- doTestFile(filename, "ISO-8859-6");
- }
-
- public void testNoEncoding() throws IOException {
- String filename = fileLocation + "NoEncoding.html";
- doTestFile(filename, null);
- }
-
- public void testnoquotes() throws IOException {
- String filename = fileLocation + "noquotes.html";
- doTestFile(filename, "UTF-8");
-
- }
-
-}
\ No newline at end of file
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 4d77a12..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- 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}\..\.." /> -->
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.html.tests.encoding" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.html.tests.encoding.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true" />
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="org.eclipse.wst.html.tests.encoding" />
- <property name="classname" value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.html.tests.encoding.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!--<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </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 ea2ac0b..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,666 +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> from plugins\com.ibm.etools.xsdeditor\samples\PurchaseOrder </LI>
- <LI><B>Invoice.dtd</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>JobDesc.xml</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>Wireless.xml</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>gotchaTCBeans.set</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>ATS.dtd</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</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>\plugins\com.ibm.sed.editor\smoke\sampleFiles\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.
-The entry would look something like
-file:\C:\builds\wsa-jdk-20010625_0100-125-R09\eclipse\plugins\com.ibm.etools.webtools\DTDs\web-app_2_2.dtd
-</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> from plugins\com.ibm.etools.xmlbuilder\samples</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 c908974..0000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,667 +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> from plugins\com.ibm.etools.xsdeditor\samples\PurchaseOrder </LI>
- <LI><B>Invoice.dtd</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>JobDesc.xml</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>Wireless.xml</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>gotchaTCBeans.set</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>ATS.dtd</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</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>\plugins\com.ibm.sed.editor\smoke\sampleFiles\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.
-The entry would look something like
-file:\C:\builds\wsa-jdk-20010625_0100-125-R09\eclipse\plugins\com.ibm.etools.webtools\DTDs\web-app_2_2.dtd
-</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> from plugins\com.ibm.etools.xmlbuilder\samples</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.sse.core.tests/.classpath b/tests/org.eclipse.wst.sse.core.tests/.classpath
deleted file mode 100644
index 275b34c..0000000
--- a/tests/org.eclipse.wst.sse.core.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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.sse.core.tests/.cvsignore b/tests/org.eclipse.wst.sse.core.tests/.cvsignore
deleted file mode 100644
index 7dd370a..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodeltests.jar
diff --git a/tests/org.eclipse.wst.sse.core.tests/.project b/tests/org.eclipse.wst.sse.core.tests/.project
deleted file mode 100644
index b073ff4..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.sse.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.sse.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4ae7945..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:48:55 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.wst.sse.core.tests/build.properties b/tests/org.eclipse.wst.sse.core.tests/build.properties
deleted file mode 100644
index 31a164e..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/build.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-bin.includes = plugin.xml,\
- ssemodeltests.jar,\
- test.xml
-source.ssemodeltests.jar = src/
-output.ssemodeltests.jar = bin/
-src.includes = test.xml,\
- plugin.xml
diff --git a/tests/org.eclipse.wst.sse.core.tests/plugin.xml b/tests/org.eclipse.wst.sse.core.tests/plugin.xml
deleted file mode 100644
index 30a0633..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.sse.core.tests"
- name="Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.sse.core.tests.SSEModelTestsPlugin">
-
- <runtime>
- <library name="ssemodeltests.jar">
- <export name="*" />
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.resources" />
- <import plugin="org.junit" />
- <import plugin="org.eclipse.wst.sse.core"/>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-
-
-<!--
- <extension point = "org.eclipse.wst.sse.core.adaptOnCreateFactory">
- <AdaptOnCreateFactory
- class="org.eclipse.wst.sse.core.tests.adaptdom.AdapterFactoryTestOnly"
- type="org.eclipse.wst.sse.core.tests.adaptdom.AdapterFactoryTestOnly"
- />
- </extension>
--->
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java
deleted file mode 100644
index b19ccdc..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.wst.sse.core.tests;
-
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
-
-
-public class ExistenceTest extends TestCase {
-
- public void testPluginExists(){
- assertNotNull(SSECorePlugin.getDefault());
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java
deleted file mode 100644
index e2d6efc..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java
+++ /dev/null
@@ -1,144 +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.sse.core.tests;
-
-import java.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.sse.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);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java
deleted file mode 100644
index 843cb40..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.sse.core.tests.events.TestAboutToBeChangedEvent;
-import org.eclipse.wst.sse.core.tests.events.TestNewDocumentContentEvent;
-import org.eclipse.wst.sse.core.tests.events.TestNewDocumentEvent;
-import org.eclipse.wst.sse.core.tests.events.TestNoChangeEvent;
-import org.eclipse.wst.sse.core.tests.events.TestRegionChangedEvent;
-import org.eclipse.wst.sse.core.tests.events.TestRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.tests.events.TestStructuredDocumentRegionsReplacedEvent;
-
-
-public class SSEModelTestSuite extends TestSuite {
-
- /**
- * to get picked up by BVT
- *
- * @return
- */
- public static Test suite() {
- return new SSEModelTestSuite();
- }
-
- // not ready for threaded tests, yet.
- // private static Class[] classes = new
- // Class[]{TestOfThreadLocalImprovement.class,
- // TestOfThreadLocalWithChanges.class, TestCreation.class};
-
- // private static Class[] classes = new Class[]{TestCreation.class,
- // TestDocumentReader.class};
- // private static Class[] classes = new Class[]{TestCreation.class,
- // TestDocumentReader.class, TestCharSequenceReader.class,
- // TestRegionMatches.class};
-
- private static Class[] classes = new Class[]{ExistenceTest.class, TestNewDocumentContentEvent.class, TestAboutToBeChangedEvent.class, TestNewDocumentEvent.class, TestNoChangeEvent.class, TestRegionChangedEvent.class,TestRegionsReplacedEvent.class,TestStructuredDocumentRegionsReplacedEvent.class};
-
- public SSEModelTestSuite() {
- super("SSE Model Basic Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- public SSEModelTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- public SSEModelTestSuite(Class theClass) {
- super(theClass);
- }
-
- public SSEModelTestSuite(String name) {
- super(name);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java
deleted file mode 100644
index bbd670d..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java
+++ /dev/null
@@ -1,77 +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.sse.core.tests;
-
-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.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSEModelTestsPlugin extends Plugin {
- //The shared instance.
- private static SSEModelTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public SSEModelTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.sse.core.tests.TestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static SSEModelTestsPlugin 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) {
- ResourceBundle bundle = SSEModelTestsPlugin.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.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java
deleted file mode 100644
index 7338b58..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.wst.sse.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-
-/**
- *
- * @author pavery
- */
-public class TestAbstractAdapterFactory extends TestCase {
-
- private AbstractAdapterFactory fFactory = null;
-
- class MyClass implements INodeAdapter {
- public boolean isAdapterForType(Object type) {
- return type instanceof MyClass;
- }
- public void notifyChanged(INodeNotifier notifier,int eventType,Object changedFeature,Object oldValue,Object newValue,int pos) {
- // noop
- }
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- setUpAdapterFactory();
- }
-
- private void setUpAdapterFactory() {
- fFactory = new AbstractAdapterFactory(TestAbstractAdapterFactory.MyClass.class, false) {
- protected INodeAdapter createAdapter(INodeNotifier target) {
- return new MyClass();
- }
- };
- }
-
- public void testAdapt() {
- fFactory.adapt(null);
- }
-
-// public void testAdaptNew() {
-// fFactory.adaptNew(null);
-// }
-
-// public void testCopy() {
-// AdapterFactory f = fFactory.copy();
-// assertNotNull(f);
-// }
-
- public void testCreate() {
-
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java
deleted file mode 100644
index 9a256c0..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java
+++ /dev/null
@@ -1,113 +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.sse.core.tests.adaptdom;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * This class exists only to satisfy some of the unit tests.
- *
- * To test, use following line in client, such as when it intitialized.
- * FactoryRegistry.getFactoryRegistry().addFactory(new AdapterFactoryTestOnly());
- *
- * Creation date: (11/14/00 7:08:18 PM)
- * @author: David Williams
- */
-public class AdapterFactoryTestOnly implements INodeAdapterFactory {
- // This factory deals with three adapters
- java.util.List adapters = new java.util.ArrayList();
-
- /**
- * CAAdapterFactory constructor.
- */
- public AdapterFactoryTestOnly() {
- super();
- adapters.add(new AdapterForDocumentTestOnly());
- adapters.add(new AdapterForElementTestOnly());
- adapters.add(new AdapterForAttrTestOnly());
- }
-
- /**
- * Method that returns the adapter associated with the this factory and the given object,
- * and "sets up" the adaptable object to use the adapter.
- *
- * The adapter may be a singleton or not ... depending on the needs of the INodeAdapter ...
- * but in general it is recommended for an adapter to be stateless,
- * so the efficiencies of a singleton can be gained.
- *
- * The implementation of this method should call addAdapter on the adapted
- * object with the correct instance of the adapter.
- */
- public INodeAdapter adapt(INodeNotifier target) {
- //object.addAdapter(adapterInstance);
- //return adapterInstance;
- INodeAdapter result = null;
-
- Iterator adaptersList = adapters.iterator();
- while (adaptersList.hasNext()) {
- INodeAdapter adapter = (INodeAdapter) adaptersList.next();
- if (adapter.isAdapterForType(target)) {
- INodeAdapter existingAdapter = target.getExistingAdapter(adapter);
- if (existingAdapter == null) {
- target.addAdapter(adapter);
- result = adapter;
- }
- }
- }
-
- return result;
-
- }
-
- /**
- * isFactoryForType method comment.
- */
- public boolean isFactoryForType(java.lang.Object type) {
- boolean result = false;
-
- // for now, one adapter for documents, elements, and attr.
- //
- if (type instanceof Document) {
- result = true;
- }
- else {
- if (type instanceof Element) {
- result = true;
- }
- else {
- if (type instanceof Attr) {
- result = true;
- }
- }
- }
-
- return result;
- }
-
- /**
- *
- */
- public void release() {
- }
-
- public INodeAdapterFactory copy() {
- return new AdapterFactoryTestOnly();
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java
deleted file mode 100644
index 8269ba7..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java
+++ /dev/null
@@ -1,47 +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.sse.core.tests.adaptdom;
-
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.w3c.dom.Attr;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (1/9/01 3:37:01 PM)
- * @author: David Williams
- */
-public class AdapterForAttrTestOnly implements INodeAdapter {
- /**
- * CAAdapterTestOnly constructor comment.
- */
- public AdapterForAttrTestOnly() {
- super();
- }
-
- /**
- * Allowing the INodeAdapter to compare itself against the type
- * allows it to return true in more than one case.
- */
- public boolean isAdapterForType(Object type) {
- if (type instanceof Attr)
- return true;
- else
- return false;
- }
-
- /**
- */
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- System.out.println("INodeAdapter AdapterForAttrTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java
deleted file mode 100644
index 7b7db09..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java
+++ /dev/null
@@ -1,47 +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.sse.core.tests.adaptdom;
-
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.w3c.dom.Document;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (1/9/01 3:37:01 PM)
- * @author: David Williams
- */
-public class AdapterForDocumentTestOnly implements INodeAdapter {
- /**
- * CAAdapterTestOnly constructor comment.
- */
- public AdapterForDocumentTestOnly() {
- super();
- }
-
- /**
- * Allowing the INodeAdapter to compare itself against the type
- * allows it to return true in more than one case.
- */
- public boolean isAdapterForType(Object type) {
- if (type instanceof Document)
- return true;
- else
- return false;
- }
-
- /**
- */
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- System.out.println("INodeAdapter AdapterForDocumentTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java
deleted file mode 100644
index dbe1590..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java
+++ /dev/null
@@ -1,47 +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.sse.core.tests.adaptdom;
-
-import org.eclipse.wst.sse.core.INodeAdapter;
-import org.eclipse.wst.sse.core.INodeNotifier;
-import org.w3c.dom.Element;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (1/9/01 3:37:01 PM)
- * @author: David Williams
- */
-public class AdapterForElementTestOnly implements INodeAdapter {
- /**
- * CAAdapterTestOnly constructor comment.
- */
- public AdapterForElementTestOnly() {
- super();
- }
-
- /**
- * Allowing the INodeAdapter to compare itself against the type
- * allows it to return true in more than one case.
- */
- public boolean isAdapterForType(Object type) {
- if (type instanceof Element)
- return true;
- else
- return false;
- }
-
- /**
- */
- public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
- System.out.println("INodeAdapter AdapterForElementTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java
deleted file mode 100644
index 1a585c1..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java
+++ /dev/null
@@ -1,194 +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.sse.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.wst.sse.core.internal.text.CharSequenceReader;
-
-import junit.framework.TestCase;
-
-
-
-public class TestCharSequenceReader extends TestCase {
-
-
- public TestCharSequenceReader() {
- super();
- }
-
-
- public TestCharSequenceReader(String name) {
- super(name);
- }
-
- String fStandardString = "test123";
-
- public void testStandardBeginning() {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
- char char1 = (char) reader.read();
- assertTrue(char1 == 't');
- char char2 = (char) reader.read();
- assertTrue(char2 == 'e');
- char char3 = (char) reader.read();
- assertTrue(char3 == 's');
- int eof = reader.read();
- assertTrue(eof == -1);
- }
-
- public void testStandardMiddle() {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 2, 3);
- char char1 = (char) reader.read();
- assertTrue(char1 == 's');
- char char2 = (char) reader.read();
- assertTrue(char2 == 't');
- char char3 = (char) reader.read();
- assertTrue(char3 == '1');
- int eof = reader.read();
- assertTrue(eof == -1);
- }
-
- public void testStandardEnd() {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 4, 3);
- char char1 = (char) reader.read();
- assertTrue(char1 == '1');
- char char2 = (char) reader.read();
- assertTrue(char2 == '2');
- char char3 = (char) reader.read();
- assertTrue(char3 == '3');
- int eof = reader.read();
- assertTrue(eof == -1);
- }
-
- public void testStandardOutOfRange() {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 50, 3);
- int eof = reader.read();
- assertTrue(eof == -1);
- }
-
- public void testStandardPartiallyOutOfRange() {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 5, 3);
- char char1 = (char) reader.read();
- assertTrue(char1 == '2');
- char char2 = (char) reader.read();
- assertTrue(char2 == '3');
- int eof = reader.read();
- assertTrue(eof == -1);
- }
-
- public void testBufferBegining() throws IOException {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
- String targetString = "tes";
-
- // intentionally small sized buffer
- char[] charbuffer = new char[2];
- StringBuffer stringBuffer = new StringBuffer();
- int nRead = 0;
- while (nRead != -1) {
- nRead = reader.read(charbuffer);
- if (nRead > 0) {
- stringBuffer.append(charbuffer, 0, nRead);
- }
- }
- String testString = stringBuffer.toString();
-
- assertEquals(targetString, testString);
-
- }
- public void testBufferEnd() throws IOException {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 4, 3);
- String targetString = "123";
-
- // intentionally small sized buffer
- char[] charbuffer = new char[2];
- StringBuffer stringBuffer = new StringBuffer();
- int nRead = 0;
- while (nRead != -1) {
- nRead = reader.read(charbuffer);
- if (nRead > 0) {
- stringBuffer.append(charbuffer, 0, nRead);
- }
- }
- String testString = stringBuffer.toString();
-
- assertEquals(targetString, testString);
-
- } public void testBufferEndEnlarged() throws IOException {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 4, 3);
- String targetString = "123";
-
- // intentionally small sized buffer
- char[] charbuffer = new char[200];
- StringBuffer stringBuffer = new StringBuffer();
- int nRead = 0;
- while (nRead != -1) {
- nRead = reader.read(charbuffer);
- if (nRead > 0) {
- stringBuffer.append(charbuffer, 0, nRead);
- }
- }
- String testString = stringBuffer.toString();
-
- assertEquals(targetString, testString);
-
- }
- public void testBufferBeginingEnlarged() throws IOException {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
- String targetString = "tes";
-
- // intentionally small sized buffer
- char[] charbuffer = new char[200];
- StringBuffer stringBuffer = new StringBuffer();
- int nRead = 0;
- while (nRead != -1) {
- nRead = reader.read(charbuffer);
- if (nRead > 0) {
- stringBuffer.append(charbuffer, 0, nRead);
- }
- }
- String testString = stringBuffer.toString();
-
- assertEquals(targetString, testString);
-
- }
- public void testBufferBeginingReduced() throws IOException {
- CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
- String targetString = "te";
-
- // intentionally small sized buffer
- char[] charbuffer = new char[2];
- StringBuffer stringBuffer = new StringBuffer();
- int nRead = 0;
- //while (nRead != -1) {
- nRead = reader.read(charbuffer, 0, 2);
- if (nRead > 0) {
- stringBuffer.append(charbuffer, 0, nRead);
- }
- //}
- String testString = stringBuffer.toString();
-
- assertEquals(targetString, testString);
- /// now continue reading same reader
- targetString = "s";
- stringBuffer = new StringBuffer();
- nRead = 0;
- //while (nRead != -1) {
- nRead = reader.read(charbuffer, 0, 2);
- if (nRead > 0) {
- stringBuffer.append(charbuffer, 0, nRead);
- }
- //}
- testString = stringBuffer.toString();
- assertEquals(targetString, testString);
-
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java
deleted file mode 100644
index c93d1aa..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java
+++ /dev/null
@@ -1,93 +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.sse.core.tests.document;
-
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentTextStore;
-
-import junit.framework.TestCase;
-
-
-
-public class TestRegionMatches extends TestCase {
-
- /**
- *
- */
- public TestRegionMatches() {
- super();
-
- }
-
- /**
- * @param name
- */
- public TestRegionMatches(String name) {
- super(name);
-
- }
-
- public void testRegionMatches1() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- structuredDocumentTextStore.set("testing123");
- boolean result = structuredDocumentTextStore.regionMatches(0, 1, "t");
- assertEquals(true, result);
- }
-
- public void testRegionMatches2() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- structuredDocumentTextStore.set("testing123");
- boolean result = structuredDocumentTextStore.regionMatches(0, 2, "t");
- assertEquals(false, result);
- }
- public void testRegionMatches3() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- structuredDocumentTextStore.set("testing123");
- boolean result = structuredDocumentTextStore.regionMatches(7, 3, "123");
- assertEquals(true, result);
- }
- public void testRegionMatches4() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- structuredDocumentTextStore.set("testing123");
- boolean result = structuredDocumentTextStore.regionMatches(8, 3, "234");
- assertEquals(false, result);
- }
-
- public void testRegionMatchesIgnoreCase() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- String test = "testing123";
- String compare = "TeSting123";
- structuredDocumentTextStore.set(test);
- boolean result = structuredDocumentTextStore.regionMatches(0, test.length(), compare);
- assertEquals(false, result);
- result = structuredDocumentTextStore.regionMatchesIgnoreCase(0, test.length(), compare);
- assertEquals(true, result);
- }
- public void testRegionMatchesIgnoreCase2() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- String test = "test\u0130ng123";
- String compare = "TeStIng123";
- structuredDocumentTextStore.set(test);
- boolean result = structuredDocumentTextStore.regionMatches(0, test.length(), compare);
- assertEquals(false, result);
- result = structuredDocumentTextStore.regionMatchesIgnoreCase(0, test.length(), compare);
- assertEquals(true, result);
- }
- public void testRegionMatchesIgnoreCase3() {
- StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
- String test = "testing123";
- String compare = "TeSt\u0131ng123";
- structuredDocumentTextStore.set(test);
- boolean result = structuredDocumentTextStore.regionMatches(0, test.length(), compare);
- assertEquals(false, result);
- result = structuredDocumentTextStore.regionMatchesIgnoreCase(0, test.length(), compare);
- assertEquals(true, result);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java
deleted file mode 100644
index ff1bb58..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java
+++ /dev/null
@@ -1,57 +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.sse.core.tests.events;
-
-import java.io.Reader;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-
-public class NullParser implements RegionParser {
-
- public IStructuredDocumentRegion getDocumentRegions() {
-
- return null;
- }
-
- public List getRegions() {
-
- return null;
- }
-
- public RegionParser newInstance() {
-
- return this;
- }
-
- public void reset(Reader reader) {
- // do nothing
-
- }
-
- public void reset(Reader reader, int offset) {
- // do nothing
-
- }
-
- public void reset(String input) {
- // do nothing
-
- }
-
- public void reset(String input, int offset) {
- // do nothing
- }
-
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java
deleted file mode 100644
index 4280e53..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java
+++ /dev/null
@@ -1,69 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.AboutToBeChangedEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-public class TestAboutToBeChangedEvent extends TestCase {
-
- public void testAboutToBeChangedEvent() {
- AboutToBeChangedEvent event = getBasicEvent();
- assertNotNull(event);
- }
-
- public void testGetDeletedText() {
- AboutToBeChangedEvent event = getBasicEvent();
- String d = event.getDeletedText();
- assertEquals(d, null);
- }
-
- public void testGetOriginalRequester() {
- AboutToBeChangedEvent event = getBasicEvent();
- Object r = event.getOriginalRequester();
- assertEquals(this, r);
- }
-
- public void testGetStructuredDocument() {
- AboutToBeChangedEvent event = getBasicEvent();
- IStructuredDocument d = event.getStructuredDocument();
- assertNotNull(d);
- }
-
- public void testSetDeletedText() {
- AboutToBeChangedEvent event = getBasicEvent();
- event.setDeletedText("junkyNothing");
- // assume ok if no exception
- assertTrue(true);
- }
-
- /*
- * Class under test for String toString()
- */
- public void testToString() {
- AboutToBeChangedEvent event = getBasicEvent();
- String r = event.toString();
- assertNotNull(r);
- }
-
- private AboutToBeChangedEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- AboutToBeChangedEvent event = new AboutToBeChangedEvent(document, this, "test", 0, 0);
- return event;
-
- }
-
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java
deleted file mode 100644
index c2e76aa..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java
+++ /dev/null
@@ -1,57 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.NewDocumentContentEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-public class TestNewDocumentContentEvent extends TestCase {
- final private static String testString = "testing";
-
- public void testNewDocumentContentEvent() {
- NewDocumentContentEvent event = getBasicEvent();
- assertNotNull(event);
- }
-
- public void testGetOffset() {
- NewDocumentContentEvent event = getBasicEvent();
- int o = event.getOffset();
- assertEquals(0, o);
- }
-
- public void testGetLength() {
- NewDocumentContentEvent event = getBasicEvent();
- int i = event.getLength();
- assertEquals(testString.length(), i);
- }
-
- /*
- * Class under test for String getText()
- */
- public void testGetText() {
- NewDocumentContentEvent event = getBasicEvent();
- String text = event.getText();
- assertEquals(testString, text);
- }
-
- private NewDocumentContentEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- document.setText(this, testString);
- NewDocumentContentEvent event = new NewDocumentContentEvent(document, this);
- return event;
-
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java
deleted file mode 100644
index c28e4e9..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java
+++ /dev/null
@@ -1,55 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-public class TestNewDocumentEvent extends TestCase {
- final private static String testString = "testing";
-
- public void testGetOffset() {
- NewDocumentEvent event = getBasicEvent();
- int o = event.getOffset();
- assertEquals(0, o);
- }
-
- public void testGetLength() {
- NewDocumentEvent event = getBasicEvent();
- int i = event.getLength();
- assertEquals(testString.length(), i);
- }
-
- public void testNewDocumentEvent() {
- NewDocumentEvent event = getBasicEvent();
- assertNotNull(event);
- }
-
-
- public void testGetText() {
- NewDocumentEvent event = getBasicEvent();
- String text = event.getText();
- assertEquals(testString, text);
- }
-
- private NewDocumentEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- document.setText(this, testString);
- NewDocumentEvent event = new NewDocumentEvent(document, this);
- return event;
-
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java
deleted file mode 100644
index 39a4d88..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java
+++ /dev/null
@@ -1,38 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-public class TestNoChangeEvent extends TestCase {
- final private static String testString = "testing";
-
- public void testNoChangeEvent() {
- NoChangeEvent event = getBasicEvent();
- assertNotNull(event);
- assertEquals(NoChangeEvent.NO_CONTENT_CHANGE, event.reason);
- }
-
- private NoChangeEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- document.setText(this, testString);
- NoChangeEvent event = new NoChangeEvent(document, this, "", 0, 0);
- event.reason = NoChangeEvent.NO_CONTENT_CHANGE;
- return event;
- }
-
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java
deleted file mode 100644
index d97a09b..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java
+++ /dev/null
@@ -1,49 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.ITextRegion;
-
-public class TestRegionChangedEvent extends TestCase {
- final private static String testString = "testing";
-
- public void testRegionChangedEvent() {
- RegionChangedEvent event = getBasicEvent();
- assertNotNull(event);
- }
-
- public void testGetRegion() {
- RegionChangedEvent event = getBasicEvent();
- IStructuredDocumentRegion structuredDocumentRegion = event.getStructuredDocumentRegion();
- assertEquals(null, structuredDocumentRegion);
- }
-
- public void testGetStructuredDocumentRegion() {
- RegionChangedEvent event = getBasicEvent();
- ITextRegion region = event.getRegion();
- assertEquals(null, region);
- }
-
- private RegionChangedEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- document.setText(this, testString);
- RegionChangedEvent event = new RegionChangedEvent(document, this, null, null, "", 0, 0);
- return event;
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java
deleted file mode 100644
index a445696..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java
+++ /dev/null
@@ -1,51 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-public class TestRegionsReplacedEvent extends TestCase {
-
- final private static String testString = "testing";
-
- public void testRegionsReplacedEvent() {
- RegionsReplacedEvent event = getBasicEvent();
- assertNotNull(event);
- }
-
- public void testGetNewRegions() {
- RegionsReplacedEvent event = getBasicEvent();
- assertNull(event.getNewRegions());
- }
-
- public void testGetOldRegions() {
- RegionsReplacedEvent event = getBasicEvent();
- assertNull(event.getOldRegions());
- }
-
- public void testGetStructuredDocumentRegion() {
- RegionsReplacedEvent event = getBasicEvent();
- assertNull(event.getStructuredDocumentRegion());
- }
-
- private RegionsReplacedEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- document.setText(this, testString);
- RegionsReplacedEvent event = new RegionsReplacedEvent(document, this, null, null, null, "", 0, 0);
- return event;
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java
deleted file mode 100644
index 0739d6f..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.wst.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-
-public class TestStructuredDocumentRegionsReplacedEvent extends TestCase {
- final private static String testString = "testing";
-
- public void testStructuredDocumentRegionsReplacedEvent() {
- StructuredDocumentRegionsReplacedEvent event = getBasicEvent();
- assertNotNull(event);
- }
-
- public void testGetNewStructuredDocumentRegions() {
- StructuredDocumentRegionsReplacedEvent event = getBasicEvent();
- assertNull(event.getNewStructuredDocumentRegions());
- }
-
- public void testGetOldStructuredDocumentRegions() {
- StructuredDocumentRegionsReplacedEvent event = getBasicEvent();
- assertNull(event.getOldStructuredDocumentRegions());
- }
-
- private StructuredDocumentRegionsReplacedEvent getBasicEvent() {
- IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
- document.setText(this, testString);
- StructuredDocumentRegionsReplacedEvent event = new StructuredDocumentRegionsReplacedEvent(document, this, null, null, "", 0, 0);
- return event;
- }
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java
deleted file mode 100644
index 9d91000..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java
+++ /dev/null
@@ -1,42 +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.sse.core.tests.examples;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-
-public class TestAtSign {
-
- public TestAtSign() {
- super();
- }
-
- public static void main(String[] args) throws IOException {
- Properties properties = new Properties(); //System.getProperties();
- properties.put("at sign", "this is an \u0040 sign");
- properties.list(System.out);
- FileOutputStream outputStream = new FileOutputStream("testAt.txt");
- properties.store(outputStream, "tests");
- outputStream.close();
- InputStream inStream = new FileInputStream("testAt.txt");
- Properties readProperties = new Properties();
- readProperties.load(inStream);
- String atSign = (String) readProperties.get("at sign");
- System.out.println("at sign from read: " + atSign);
-
-
-
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java
deleted file mode 100644
index 32a5754..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.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.sse.core.tests.life;
-
-import org.eclipse.wst.sse.core.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.model.AbstractStructuredModel;
-
-
-
-public class EmptyModelForTests extends AbstractStructuredModel {
-
- public EmptyModelForTests() {
-
- super();
- // TODO Auto-generated constructor stub
- }
-
- public IndexedRegion getIndexedRegion(int offset) {
-
- // TODO Auto-generated method stub
- return null;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java
deleted file mode 100644
index 2a987d7..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java
+++ /dev/null
@@ -1,70 +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.sse.core.tests.life;
-
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.model.ModelLifecycleEvent;
-
-import junit.framework.TestCase;
-
-
-
-
-public class TestCreation extends TestCase {
- private boolean DEBUG = false;
-
- public void testCreation() {
- IStructuredModel structuredModel = new EmptyModelForTests();
- ModelLifecycleEvent event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RELEASED);
- if (DEBUG) {
- System.out.println(event);
- }
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_DIRTY_STATE);
- if (DEBUG) {
- System.out.println(event);
- }
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_DOCUMENT_CHANGED);
- if (DEBUG) {
- System.out.println(event);
- }
- /* event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_REINITIALIZED);
- if (DEBUG) {
- System.out.println(event);
- }
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.ADAPTERS_NOTIFIED);
- if (DEBUG) {
- System.out.println(event);
- }
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RELOADED);
- if (DEBUG) {
- System.out.println(event);
- }
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RESOURCE_DELETED);
- if (DEBUG) {
- System.out.println(event);
- }
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RESOURCE_MOVED);
- if (DEBUG) {
- System.out.println(event);
- }
- */
- event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_SAVED);
- if (DEBUG) {
- System.out.println(event);
- }
-
-
- // if gets to here without exception, assume ok.
- assertTrue(true);
-
-
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java
deleted file mode 100644
index f0e6a3f..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java
+++ /dev/null
@@ -1,187 +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.sse.core.tests.threading;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-
-
-/**
- * To print out timings, set DEBUG_TEST to true, other wise, this test passes
- * if no exceptions thrown.
- */
-public class TestOfThreadLocalImprovement extends TestCase {
- // number of times a pair of tests (with and without) thread local are
- // repeated (for more accurate averages).
- int nTrials = 3;
- IStructuredDocument fDocument = null;
- private static final boolean DEBUG_TEST = false;
- private static final boolean DEBUG_TEST_DETAIL = false;
- // tests from 1 to MAX_TREADS-1 threads
- private int MAX_THREADS = 5;
- private long SLEEP_TIME = 0;
-
- public TestOfThreadLocalImprovement() throws IOException {
- super();
- }
-
- private final String getContent() {
- return "<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)" + "</test>";
- }
-
- private IStructuredDocument getDocument(String content) throws IOException {
- if (fDocument == null) {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- fDocument = modelManager.createStructuredDocumentFor("testPerf.xml", content, null);
- }
- return fDocument;
- }
-
- void linkRunner(final Boolean direction, IStructuredDocument document) {
- IStructuredDocument structuredDocument = document;
- IStructuredDocumentRegion previousDocumentRegion = null;
- long startTime = System.currentTimeMillis();
- int start = 0;
- int length = structuredDocument.getLength();
- int nRegions = 0;
- for (int i = start; i < length; i++) {
- int index = i;
- if (!direction.booleanValue()) {
- index = (length - 1) - i;
- }
- IStructuredDocumentRegion currentDocumentRegion = structuredDocument.getRegionAtCharacterOffset(index);
- if (currentDocumentRegion != previousDocumentRegion) {
- nRegions++;
- previousDocumentRegion = currentDocumentRegion;
- }
- Thread.yield();
- try {
- Thread.sleep(SLEEP_TIME);
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- long endTime = System.currentTimeMillis();
- if (DEBUG_TEST_DETAIL) {
- System.out.println("Thread: " + Thread.currentThread() + " from " + length + " characters, found " + nRegions + " regions in " + (endTime - startTime) + " msecs.");
- }
- }
-
- private long dotestDocumentWalkingWithThreadLocal(int nThreads) throws IOException {
- BasicStructuredDocument.setUSE_LOCAL_THREAD(true);
- fDocument = getDocument(getContent());
- long startTimeOverall = System.currentTimeMillis();
- doDocumentWalking(nThreads);
- long endTimeOverall = System.currentTimeMillis();
- long finalOverall = endTimeOverall - startTimeOverall;
- if (DEBUG_TEST_DETAIL) {
- System.out.println("Overall time using Local_Thread: " + finalOverall);
- }
- return finalOverall;
- }
-
- private long dotestDocumentWalkingWithoutThreadLocal(int nThreads) throws IOException {
- BasicStructuredDocument.setUSE_LOCAL_THREAD(false);
- fDocument = getDocument(getContent());
- long startTimeOverall = System.currentTimeMillis();
- doDocumentWalking(nThreads);
- long endTimeOverall = System.currentTimeMillis();
- long finalOverall = endTimeOverall - startTimeOverall;
- if (DEBUG_TEST_DETAIL) {
- System.out.println("Overall time NOT using Local_Thread: " + finalOverall);
- }
- return finalOverall;
- }
-
- private void doDocumentWalking(int nThreads) throws IOException {
- Thread[] threads = new Thread[nThreads];
- boolean toggle = true;
- for (int i = 0; i < threads.length; i++) {
- final Boolean direction = new Boolean(toggle);
- toggle = !toggle;
- ThreadGroup threadGroup = new ThreadGroup("sse unit tests");
- Thread thread = new Thread(threadGroup, new Runnable() {
- public void run() {
- linkRunner(direction, fDocument);
- }
- }, ("sse unit test thread " + i));
- // I used MIN_PRIORITY since that makes it easier to "see" in debugger list of threads
- thread.setPriority(Thread.MIN_PRIORITY);
- threads[i] = thread;
- }
- for (int i = 0; i < threads.length; i++) {
- threads[i].start();
- }
- try {
- for (int i = 0; i < threads.length; i++) {
- threads[i].join();
-
- }
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- public void testNThreads() throws IOException {
- for (int i = 1; i < MAX_THREADS; i++) {
- int nThreads = i;
- if (DEBUG_TEST_DETAIL) {
- System.out.println(" >>>>---- N Threads: " + i);
- }
- float woCumm = 0;
- float wCumm = 0;
-
- for (int j = 0; j < nTrials; j++) {
- woCumm = woCumm + dotestDocumentWalkingWithoutThreadLocal(nThreads);
- wCumm = wCumm + dotestDocumentWalkingWithThreadLocal(nThreads);
- }
- float averageWO = woCumm / nTrials;
- float averageW = wCumm / nTrials;
- float perThreadWO = averageWO / nThreads;
- float perThreadW = averageW / nThreads;
- int roundedWO = new Float(perThreadWO).intValue();
- int roundedW = new Float(perThreadW).intValue();
- if (DEBUG_TEST) {
- System.out.println("Average per thread: without: " + roundedWO + " with: " + roundedW);
- System.out.println(" <<<<<---- N Threads: " + i);
- }
- }
- // if gets to here (with no exceptions) all is ok.
- assertTrue(0 == 0);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java
deleted file mode 100644
index 506de0e..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java
+++ /dev/null
@@ -1,191 +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.sse.core.tests.threading;
-
-import java.io.IOException;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-
-
-/**
- * This class started off as copy of TestOfThreadLocalImprovements, and I just
- * added another thread with modifies the document.
- */
-public class TestOfThreadLocalWithChanges extends TestCase {
- // number of times a pair of tests (with and without) thread local are
- // repeated (for more accurate averages).
- int nTrials = 3;
- IStructuredDocument fDocument = null;
- private static final boolean DEBUG_TEST_DETAIL = false;
- // tests from 1 to MAX_TREADS-1 threads
- private int MAX_THREADS = 14;
- private long SLEEP_TIME = 2;
- private int N_CHANGES = 10000;
-
- public TestOfThreadLocalWithChanges() throws IOException {
- super();
- }
-
- private final String getContent() {
- return "<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)" + "</test>";
- }
-
- private IStructuredDocument getDocument(String content) throws IOException {
- if (fDocument == null) {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- fDocument = modelManager.createStructuredDocumentFor("testPerf.xml", content, null);
- }
- return fDocument;
- }
-
- void linkRunner(final Boolean direction, IStructuredDocument document) {
- IStructuredDocument structuredDocument = document;
- IStructuredDocumentRegion previousDocumentRegion = null;
- long startTime = System.currentTimeMillis();
- int start = 0;
- int length = structuredDocument.getLength();
- int nRegions = 0;
- // I made length "dynamic" after adding modification thread
- for (int i = start; i < structuredDocument.getLength(); i++) {
- int index = i;
- if (!direction.booleanValue()) {
- int currentLength = structuredDocument.getLength();
- index = (currentLength - 1) - i;
- }
- IStructuredDocumentRegion currentDocumentRegion = structuredDocument.getRegionAtCharacterOffset(index);
- if (currentDocumentRegion != previousDocumentRegion) {
- nRegions++;
- previousDocumentRegion = currentDocumentRegion;
- }
- Thread.yield();
- try {
- Thread.sleep(SLEEP_TIME);
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- long endTime = System.currentTimeMillis();
- if (DEBUG_TEST_DETAIL) {
- System.out.println("Thread: " + Thread.currentThread() + " from " + length + " characters, found " + nRegions + " regions in " + (endTime - startTime) + " msecs.");
- }
- }
-
- private long dotestDocumentWalkingWithThreadLocal(int nThreads) throws IOException {
- BasicStructuredDocument.setUSE_LOCAL_THREAD(true);
- fDocument = getDocument(getContent());
- long startTimeOverall = System.currentTimeMillis();
- doDocumentWalking(nThreads);
- long endTimeOverall = System.currentTimeMillis();
- long finalOverall = endTimeOverall - startTimeOverall;
- if (DEBUG_TEST_DETAIL) {
- System.out.println("Overall time using Local_Thread: " + finalOverall);
- }
- return finalOverall;
- }
-
- private void doDocumentWalking(int nThreads) throws IOException {
- Thread[] threads = new Thread[nThreads];
- boolean toggle = true;
- for (int i = 0; i < threads.length; i++) {
- final Boolean direction = new Boolean(toggle);
- // toggle controls whether moves from start to end, or end to start
- // of document.
- toggle = !toggle;
- ThreadGroup threadGroup = new ThreadGroup("unit tests");
- Thread thread = new Thread(threadGroup, new Runnable() {
- public void run() {
- linkRunner(direction, fDocument);
- }
- }, ("sse unit test thread " + i));
- // I used MIN_PRIORITY since that makes it easier to "see" in
- // debugger list of threads
- thread.setPriority(Thread.MIN_PRIORITY);
- threads[i] = thread;
- }
- for (int i = 0; i < threads.length; i++) {
- threads[i].start();
- }
- // now that "readers" have started, we'll start a modification thread
- // too
- Thread modifyingThread = new Thread(new Runnable() {
- public void run() {
- modifiyDocument(fDocument);
- }
- }, ("sse unit test modification thread "));
- // I used MAX_PRIORITY to be sure lots of modifications take place
- modifyingThread.setPriority(Thread.MIN_PRIORITY);
- modifyingThread.start();
- try {
- for (int i = 0; i < threads.length; i++) {
- threads[i].join();
- }
- modifyingThread.join();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- void modifiyDocument(IStructuredDocument document) {
- Random random = new Random();
- for (int i = 0; i < N_CHANGES + 1; i++) {
- int randomOffset = random.nextInt(document.getLength());
- // 100 just seems like a good maximum length to replace
- // (could play with in future).
- int randomLength = random.nextInt(100);
- // if we "accidently" get more than the length, just skipit
- if (randomOffset + randomLength < document.getLength()) {
- document.replaceText(this, randomOffset, randomLength, "testingtext");
- }
- }
- }
-
- public void testNThreads() throws IOException {
- for (int i = 1; i < MAX_THREADS; i++) {
- int nThreads = i;
- if (DEBUG_TEST_DETAIL) {
- System.out.println(" >>>>---- N Threads: " + i);
- }
- float wCumm = 0;
- for (int j = 0; j < nTrials; j++) {
- wCumm = wCumm + dotestDocumentWalkingWithThreadLocal(nThreads);
- }
- }
- // if gets to here (with no exceptions) all is ok.
- assertTrue(0 == 0);
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java
deleted file mode 100644
index 747d01f..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java
+++ /dev/null
@@ -1,86 +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.sse.core.tests.threading;
-
-import java.util.Random;
-
-/**
- * See http://java.sun.com/developer/JDCTechTips/2003/tt1208.html#2 for
- * informative article.
- */
-public class ThreadLocalExample {
-
- // Create thread local class
- // Initial value is a random number from 0-999
- private static class MyThreadLocal extends ThreadLocal {
- private Random innerRandom = new Random();
-
- protected Object initialValue() {
- return new Integer(innerRandom.nextInt(1000));
- }
- }
-
- // Create class variable
- static volatile int counter = 0;
-
- // Define/create thread local variable
- static ThreadLocal threadLocal = new MyThreadLocal();
-
- // For random number generation
- // static Random random = new Random();
-
- // Displays thread local variable, counter,
- // and thread name
- static void displayValues() {
- System.out.println(threadLocal.get() + "\t" + counter + "\t" + Thread.currentThread().getName());
- }
-
- public static void main(String args[]) {
-
- // Each thread increments counter
- // Displays variable info
- // And sleeps for the random amount of time
- // Before displaying info again
- Runnable runner = new Runnable() {
- public void run() {
- synchronized (ThreadLocalExample.class) {
- counter++;
- }
- displayValues();
- try {
- Thread.sleep(((Integer) threadLocal.get()).intValue());
- displayValues();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- };
-
- // Another instance of class created
- // and values displayed
- displayValues();
-
- // Here's where the other threads
- // are actually created
- for (int i = 0; i < 5; i++) {
- Thread t = new Thread(runner);
- t.start();
- }
- }
-
- /**
- *
- */
- public ThreadLocalExample() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java
deleted file mode 100644
index 5d08f59..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java
+++ /dev/null
@@ -1,90 +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.sse.core.tests.threading;
-
-import java.util.Random;
-
-/**
- * See http://java.sun.com/developer/JDCTechTips/2003/tt1208.html#2 for
- * informative article.
- */
-public class ThreadLocalInstanceExample {
-
- // Create thread local class
- // Initial value is a random number from 0-999
- private class MyThreadLocal extends ThreadLocal {
- private Random innerRandom = new Random();
-
- protected Object initialValue() {
- return new Integer(innerRandom.nextInt(1000));
- }
- }
-
- // Create class variable
- static volatile int counter = 0;
-
- // Define/create thread local variable
- ThreadLocal threadLocal = new MyThreadLocal();
-
- // For random number generation
- // static Random random = new Random();
-
- // Displays thread local variable, counter,
- // and thread name
- void displayValues() {
- System.out.println(threadLocal.get() + "\t" + counter + "\t" + Thread.currentThread().getName());
- }
-
- public static void main(String args[]) {
- new ThreadLocalInstanceExample().startRun();
- }
-
- private void startRun() {
-
- // Each thread increments counter
- // Displays variable info
- // And sleeps for the random amount of time
- // Before displaying info again
- Runnable runner = new Runnable() {
- public void run() {
- synchronized (this) {
- counter++;
- }
- displayValues();
- try {
- Thread.sleep(((Integer) threadLocal.get()).intValue());
- displayValues();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- };
-
- // Another instance of class created
- // and values displayed
- displayValues();
-
- // Here's where the other threads
- // are actually created
- for (int i = 0; i < 5; i++) {
- Thread t = new Thread(runner);
- t.start();
- }
- }
-
- /**
- *
- */
- public ThreadLocalInstanceExample() {
- super();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/test.xml b/tests/org.eclipse.wst.sse.core.tests/test.xml
deleted file mode 100644
index cd6833b..0000000
--- a/tests/org.eclipse.wst.sse.core.tests/test.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.sse.core.tests" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.sse.core.tests.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.sse.core.tests.SSEModelTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.sse.core.tests.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!-- <emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </target>
-
-</project>
\ No newline at end of file
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 065ac06..0000000
--- a/tests/org.eclipse.wst.xml.core.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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 fd4ea5e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodelxmltests.jar
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.jdt.core.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8708fa8..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:49:20 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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 a66286f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/build.properties
+++ /dev/null
@@ -1,21 +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
-###############################################################################
-source.ssemodelxmltests.jar = src/
-output.ssemodelxmltests.jar = bin/
-bin.includes = plugin.xml,\
- ssemodelxmltests.jar,\
- test.xml,\
- testfiles.zip,\
- projecttestfiles/
-src.includes = test.xml,\
- plugin.xml,\
- testfiles.zip,\
- projecttestfiles/
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 f439a8f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.xml.core.tests"
- name="SSE Model XML Tests"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin">
-
- <runtime>
- <library name="ssemodelxmltests.jar">
- <export name="*" />
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.xml.core" />
- <import plugin="org.junit" />
- <import plugin="org.eclipse.core.filebuffers"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.text"/>
- <import plugin="org.eclipse.wst.sse.core"/>
- </requires>
-
-
- <extension
- point="org.eclipse.core.runtime.contentTypes">
- <!-- associate .fragx files with the XML content type -->
- <file-association
- content-type="org.eclipse.core.runtime.xml"
- file-extensions="fragx"/>
- </extension>
-
-
-</plugin>
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/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 499df59..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.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);
- }
-}
\ No newline at end of file
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 fc22493..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
+++ /dev/null
@@ -1,46 +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;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-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.NameValidatorTests;
-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.text.TestStructuredPartitionerXML;
-
-
-
-public class SSEModelXMLTestSuite extends TestSuite {
- public static Test suite() {
- return new SSEModelXMLTestSuite();
- }
-
- public SSEModelXMLTestSuite() {
- super("Test Suite for org.eclipse.wst.xml.core.tests");
- addTest(new TestSuite(TestModelsFromFiles.class));
- addTest(new TestSuite(TestXMLModelLoader.class));
- addTest(new TestSuite(TestXMLDocumentLoader.class));
- addTest(new TestSuite(TestStructuredDocument.class));
-
- addTest(new TestSuite(TestModelManager.class));
- addTest(new TestSuite(TestStructuredModel.class));
- addTest(new TestSuite(TestStructuredPartitionerXML.class));
- addTest(new TestSuite(NameValidatorTests.class));
- addTest(new TestSuite(TransitionTests.class));
- }
-}
\ No newline at end of file
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 f4665ba..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
+++ /dev/null
@@ -1,79 +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;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-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 = Platform.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;
- }
-}
\ 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 0a47dba..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,331 +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.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.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-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 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", expectedDocumentClass.isInstance(document));
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(document.getDocumentPartitioner()));
- bufferManager.disconnect(locationPath, 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 doTestCreateCreateEmpty(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);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- assertTrue("wrong partitioner in document", expectedPartioner.isInstance(document.getDocumentPartitioner()));
- bufferManager.disconnect(locationPath, 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 {
- doTestCreateCreateEmpty("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);
- }
-*/
-}
\ No newline at end of file
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 0f86a60..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
+++ /dev/null
@@ -1,281 +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.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.Position;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-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 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 XMLModelLoader fLoader = null;
-
- 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){
- 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 IStructuredModel getUnmanagedModel() {
- // from a file
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = fLoader.createModel();
- fLoader.load(f, model);
- ModelHandlerForXML xmlModelHandler = new ModelHandlerForXML();
- model.setModelHandler(xmlModelHandler);
- model.setBaseLocation(fProjectName + "/files/simple.xml");
- try {
- model.setId(fProjectName + "/files/simple.xml");
- }
- catch (ResourceInUse e) {
- // ignore
- }
- }
- 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"));
- }
-
-
-
- public void testDocumentChangingListener() throws BadLocationException {
- // TODO: may need to fake events to really tests this
-
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
-
- TestListener listener = new TestListener();
-
- sDoc.addDocumentChangingListener(listener);
- String text = sDoc.get();
- sDoc.replace(0, text.length(), text);
-
- sDoc.removeDocumentChangingListener(listener);
- }
-
- public void testReadOnly() {
-
- IStructuredModel model = getUnmanagedModel();
- 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()));
- }
-
- public void testGetRegionAtCharacterOffset() {
- IStructuredModel model = getUnmanagedModel();
- 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);
- }
-
- public void testGetRegionList() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocumentRegionList regions = sDoc.getRegionList();
- assertNotNull("couldn't get region list", regions);
- assertEquals(17, regions.getLength());
-
- }
-
- public void testGetText() {
- IStructuredModel model = getUnmanagedModel();
- 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);
- }
-
- public void testNewInstance() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- IStructuredDocument newDoc = sDoc.newInstance();
- assertNotSame("document instances should be different", sDoc, newDoc);
- }
-
- public void testReplaceText() throws BadLocationException {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.replace(0, sDoc.getLength(), "replaced");
-
- String text = sDoc.getText();
- assertEquals("replaced", text);
- }
-
- public void testOverrideReadOnlyReplaceText() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.makeReadOnly(0, 1);
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
- assertNotSame("text should not have been replacable (read only)", "replaced", sDoc.getText());
-
- sDoc.replaceText(this, 0, sDoc.getLength(), "replaced", true);
- assertEquals("text should have been forced replaced", "replaced", sDoc.getText());
- }
-
- public void testSetText() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- sDoc.setText(this, "set text");
- assertEquals("set text failed", "set text", sDoc.getText());
- }
-
- public void testGetEncodingMemento() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- EncodingMemento memento = sDoc.getEncodingMemento();
- assertNotNull("couldn't get encoding memento", memento);
- }
-
- public void testGetDetectedLineDelimiter() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- String delim = sDoc.getLineDelimiter();
- assertEquals("wrong preferred line delmiter", "\r\n", delim);
- }
-
- public void testSetEncodingMemento() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument sDoc = model.getStructuredDocument();
- EncodingMemento memento = new EncodingMemento();
- sDoc.setEncodingMemento(memento);
- EncodingMemento gottenMemento = sDoc.getEncodingMemento();
- assertEquals("mementos don't match", memento, gottenMemento);
- }
-
- public void setDetectedLineDelimiter() {
- IStructuredModel model = getUnmanagedModel();
- 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);
- }
-
- public void testStringMatches() {
- // TODO: will need a test when this API is created
-// IStructuredModel model = getUnmanagedModel();
-// IStructuredDocument sDoc = model.getStructuredDocument();
- }
-
- public void testCreatePosition() throws BadPositionCategoryException, BadLocationException {
- IStructuredModel model = getUnmanagedModel();
- 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);
- }
-}
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 dea5f86..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, 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.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.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredPartitioning;
-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 c88c54a..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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/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 b060e58..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
+++ /dev/null
@@ -1,59 +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.core.tests.dom;
-
-import org.eclipse.wst.xml.core.NameValidator;
-
-import junit.framework.TestCase;
-
-public class NameValidatorTests extends TestCase {
-
- private int nTrials = 100;
-
- public NameValidatorTests(String name) {
- super(name);
- }
-
- private void doTest(int testNumber, String testString, Boolean expectedValidity) {
- boolean isValid = NameValidator.isValid(testString);
- assertEquals("testNumber: " + testNumber, expectedValidity.booleanValue(), isValid);
- }
-
- public void testIsValid() {
- Object[][] testees = new Object[][]{
- {"initial",Boolean.TRUE},
- {"foo",Boolean.TRUE},
- {"4",Boolean.FALSE},
- {"9999", Boolean.FALSE},
- {"f9999", Boolean.TRUE},
- {"", Boolean.FALSE},
- {"got space", Boolean.FALSE},
- {" spacebefore", Boolean.FALSE},
- {"spaceafter ", Boolean.FALSE},
- {"ns:namespace", Boolean.TRUE},
- {":funnyns", Boolean.TRUE},
- /* ISSUE: is "endns:" really valid name */
- {"endns:", Boolean.TRUE},
- {"us_underscore", Boolean.TRUE},
- {"_underscore", Boolean.TRUE},
- {"underscore_", Boolean.TRUE},
- {"averylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersize", Boolean.TRUE},
- };
- 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/hacks/TestStringUtils.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/hacks/TestStringUtils.java
deleted file mode 100644
index 463c607..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/hacks/TestStringUtils.java
+++ /dev/null
@@ -1,46 +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.hacks;
-
-
-
-public class TestStringUtils {
-
- /**
- * TestStringUtils constructor comment.
- */
- private TestStringUtils() {
- super();
- }
-
- /**
- * Replace matching literal portions of a string with another string
- */
- public static String replace(String aString, String source, String target) {
- if (aString == null)
- return null;
- String normalString = ""; //$NON-NLS-1$
- int length = aString.length();
- int position = 0;
- int previous = 0;
- int spacer = source.length();
- while (position + spacer - 1 < length && aString.indexOf(source, position) > -1) {
- position = aString.indexOf(source, previous);
- normalString = normalString + aString.substring(previous, position) + target;
- position += spacer;
- previous = position;
- }
- normalString = normalString + aString.substring(position, aString.length());
-
- return normalString;
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/hacks/VersionRemover.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/hacks/VersionRemover.java
deleted file mode 100644
index f05354c..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/hacks/VersionRemover.java
+++ /dev/null
@@ -1,105 +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.hacks;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.eclipse.wst.xml.core.tests.util.CommonXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-
-
-/**
- * Modifies plugin.xml and fragment.xml files to not require specific versions
- * of their plugin dependencies.
- *
- * @author nitin
- */
-public class VersionRemover {
-
- char[] charbuff = new char[2048];
- StringBuffer s = null;
-
- public VersionRemover() {
- super();
- }
-
-
-
- public static void main(String[] args) {
- if (args.length < 1)
- new VersionRemover().visit(new File("d:/target"));
- else
- new VersionRemover().visit(new File(args[0]));
- }
-
-
-
- protected void visit(File file) {
- // Skip directories like org.eclipse.*, org.apache.*, and org.junit.*
- if (file.isDirectory() && !file.getName().startsWith("org.eclipse.") && !file.getName().startsWith("org.apache") && !file.getName().startsWith("org.junit")) {
- String[] contents = file.list();
- for (int i = 0; i < contents.length; i++)
- visit(new File(file.getAbsolutePath() + '/' + contents[i]));
- }
- else {
- fixupFile(file);
- }
- }
-
- protected void fixupFile(File file) {
- // only load and fixup files named plugin.xml or fragment.xml under eclipse\plugins\com.ibm.*
- if (!(file.getName().equalsIgnoreCase("plugin.xml") || file.getName().equalsIgnoreCase("fragment.xml")) || file.getAbsolutePath().indexOf("eclipse\\plugins\\com.ibm.") == -1)
- return;
- // System.out.println(file.getAbsolutePath());
- try {
- Document doc = CommonXML.getDocumentBuilder().parse(file);
- NodeList imports = null;
- if (file.getName().equalsIgnoreCase("plugin.xml"))
- imports = doc.getElementsByTagName("import");
- else if (file.getName().equalsIgnoreCase("fragment.xml"))
- imports = doc.getElementsByTagName("fragment");
- boolean changed = false;
- for (int i = 0; i < imports.getLength(); i++) {
- Node importNode = imports.item(i);
- if (importNode.getNodeName().equalsIgnoreCase("import") && importNode.getAttributes().getNamedItem("version") != null) {
- changed = true;
- importNode.getAttributes().removeNamedItem("version");
- }
- if (importNode.getAttributes().getNamedItem("plugin-version") != null) {
- changed = true;
- importNode.getAttributes().removeNamedItem("plugin-version");
- }
- if (importNode.getAttributes().getNamedItem("match") != null) {
- importNode.getAttributes().removeNamedItem("match");
- changed = true;
- }
- }
- if (changed) {
- FileOutputStream ostream = new FileOutputStream(file.getAbsolutePath());
- CommonXML.serialize(doc, ostream);
- ostream.close();
- System.out.println("Modified " + file.getAbsolutePath());
- }
- }
- catch (SAXException e) {
- System.err.println(file.getPath() + ": " + e);
- }
- catch (IOException e) {
- System.err.println(file.getPath() + ": " + e);
- }
- }
-}
\ 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 760cbaf..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-
-
-
-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());
- }
-
-}
\ No newline at end of file
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 21cf5aa..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
+++ /dev/null
@@ -1,255 +0,0 @@
-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.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.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;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- IStructuredModel gottenModel = getMM().getExistingModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.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;
- try {
- model = getStructuredModelForEdit();
- IStructuredDocument doc = model.getStructuredDocument();
- IStructuredModel gottenModel = getMM().getModelForEdit(doc);
- assertTrue("models should be the same instance", model == gottenModel);
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- public void testIsShared() {
- IStructuredModel model = null;
- try {
- model = 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();
- }
- }
-
- 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 5936255..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,55 +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.model;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.sse.core.IModelManager;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.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 {
- public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
- public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
- /**
- * @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);
- }
- modelManager.getNewModelForEdit(file, true);
- // count as success if gets to heer without exception
- assertTrue(true);
- }
-
-}
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 07e8fe7..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
+++ /dev/null
@@ -1,206 +0,0 @@
-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.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.IModelStateListener;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-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 TestStructuredModel extends TestCase {
-
- private boolean isSetup = false;
- private XMLModelLoader fLoader = null;
-
- 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){
- 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 IStructuredModel getUnmanagedModel() {
- // from a file
- IFile f = getFile();
- IStructuredModel model = null;
- try {
- model = fLoader.createModel();
- fLoader.load(f, model);
- ModelHandlerForXML xmlModelHandler = new ModelHandlerForXML();
- model.setModelHandler(xmlModelHandler);
- model.setBaseLocation(fProjectName + "/files/simple.xml");
- try {
- model.setId(fProjectName + "/files/simple.xml");
- }
- catch (ResourceInUse e) {
- // ignore
- }
- }
- 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"));
- }
-
- public void testAboutToChangeModel() {
- IStructuredModel model = getUnmanagedModel();
- model.aboutToChangeModel();
- }
-
- public void testAddRemoveModelStateListener() {
- IStructuredModel model = getUnmanagedModel();
- 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);
- }
-
-
- public void testChangedModel() {
- IStructuredModel model = getUnmanagedModel();
- model.changedModel();
- }
-
-
- public void testGetContentType() {
- IStructuredModel model = getUnmanagedModel();
- String ct = model.getContentTypeIdentifier();
- assertTrue("model has wrong content type:" + ct + " != " + ContentTypeIdForXML.ContentTypeID_XML, ct.equals(ContentTypeIdForXML.ContentTypeID_XML));
- }
-
- public void testGetBaseLocation() {
- IStructuredModel model = getUnmanagedModel();
- String location = model.getBaseLocation();
- assertTrue("wrong base location", location.equals(fProjectName + "/files/simple.xml"));
- }
-
-
- public void testGetFactoryRegistry() {
- IStructuredModel model = getUnmanagedModel();
- model.getFactoryRegistry();
- }
-
- public void testGetIndexedRegion() {
- IStructuredModel model = getUnmanagedModel();
- model.getIndexedRegion(0);
- }
-
- public void testGetIndexedRegions() {
- IStructuredModel model = getUnmanagedModel();
- // not implemented yet...
- //model.getIndexedRegions();
- }
-
- public void testGetStructuredDocument() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredDocument doc = model.getStructuredDocument();
- assertNotNull("document is null", doc);
- }
-
- public void testIsDirty() {
- IStructuredModel model = getUnmanagedModel();
- assertFalse("model should not be dirty", model.isDirty());
- }
-
- public void testIsModelStateChanging() {
- IStructuredModel model = getUnmanagedModel();
- assertFalse("model should not be changing", model.isModelStateChanging());
- }
-
- public void testIsNew() {
- IStructuredModel model = getUnmanagedModel();
- // this API seems strange
- //assertFalse("new model check failed", model.isNew());
- }
-
- public void testIsReinitializationNeeded() {
- IStructuredModel model = getUnmanagedModel();
- assertFalse("reinitialization should not be needed", model.isReinitializationNeeded());
- }
-
-
- public void testIsSaveNeeded() {
- IStructuredModel model = getUnmanagedModel();
- assertFalse("save should not be needed", model.isSaveNeeded());
- }
-
- public void testNewInstance() {
- IStructuredModel model = getUnmanagedModel();
- IStructuredModel newInstance = null;
- try {
- newInstance = model.newInstance();
- }
- catch (IOException e) {
- assertTrue("IOException during model new instance", false);
- }
- assertNotNull("new instance is null", newInstance);
- }
-}
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 c47b87e..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java
+++ /dev/null
@@ -1,128 +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.IStructuredModel;
-import org.eclipse.wst.sse.core.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;
-
-/**
- *
- * @since 1.0
- */
-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");
-
- IStructuredModel modelFromDoc = fLoader.createModel(sDoc, "/test");
- 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/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 fbe235e..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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;
- }
-
-}
\ No newline at end of file
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 f22a74a..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
+++ /dev/null
@@ -1,355 +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.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.DecimalFormat;
-
-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.IModelManager;
-import org.eclipse.wst.sse.core.IStructuredModel;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.sse.core.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.text.IStructuredTextPartitioner;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-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");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- 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");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
- }
-
- public void testPerfXML() throws IOException, BadLocationException {
- int expectedPartitions = 6;
- int nPartitions = doTimedComputePartitioningTest("testfiles/xml/company300k.xml");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- 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!", partitions[i].getOffset(), offset);
- 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;
- }
-}
\ 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/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 927ed06..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
+++ /dev/null
@@ -1,46 +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.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @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;
- }
-
-}
\ No newline at end of file
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 6b08a1f..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,165 +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.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-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 = Platform.asLocalURL(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 = Platform.asLocalURL(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;
- }
-
-}
\ No newline at end of file
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 0368146..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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);
- }
-}
\ No newline at end of file
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 efe4d36..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
+++ /dev/null
@@ -1,51 +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.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @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;
- }
-
-}
\ No newline at end of file
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 a6d25a0..0000000
--- a/tests/org.eclipse.wst.xml.core.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<project name="testsuite" default="run" basedir=".">
-
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.xml.core.tests" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.xml.core.tests.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true" />
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.xml.core.tests.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!-- <emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </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 275b34c..0000000
--- a/tests/org.eclipse.wst.xml.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.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 57763eb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-tests.jar
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.jdt.core.prefs b/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index dbcd0c3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:49:28 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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 345bf80..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/build.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-bin.includes = plugin.xml,\
- *.jar,\
- tests.jar,\
- config/,\
- testfiles/,\
- testfiles.zip,\
- info/,\
- test.xml
-src.includes = testfiles.zip,\
- testfiles/,\
- plugin.xml,\
- info/,\
- config/,\
- test.xml
-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.xml b/tests/org.eclipse.wst.xml.tests.encoding/plugin.xml
deleted file mode 100644
index 2fbdc64..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.xml.tests.encoding"
- name="Encoding Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.xml.tests.encoding.TestsPlugin">
-
- <runtime>
- <library name="tests.jar">
- <export name="*" />
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.resources" />
- <import plugin="org.junit" />
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ui.workbench" />
- <import plugin="org.eclipse.ui.ide" />
- <import plugin="org.eclipse.wst.xml.core"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.sse.core"/>
- </requires>
-
-
-
-</plugin>
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 761a775..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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();
- }
-}
\ No newline at end of file
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 51f01ba..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.tests.encoding;
-
-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.TestContentTypeDetection;
-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;
-import org.eclipse.wst.xml.tests.encoding.xml.XMLMalformedInputTests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class EncodingTestSuite extends TestSuite {
-
- // FIXME: commented out lang. spec. tests, until all migrated to org.eclipse
- private static Class[] classes = new Class[]{TestOverrides.class, TestCodedReader.class, TestCodedWrite.class, XMLEncodingTests.class, XMLHeadTokenizerTester.class, XMLMalformedInputTests.class, TestContentTypeDescriptionOnGennedFiles.class, TestCodedReaderOnGennedFiles.class, TestContentTypeDetection.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("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();
- }
-}
\ No newline at end of file
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 f637647..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.Platform;
-
-/**
- * @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 = Platform.asLocalURL(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;
- }
-
-}
\ No newline at end of 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 7b9a773..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java
+++ /dev/null
@@ -1,413 +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.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;
- String newTrueString = null;
- byte[] translatedBytes = null;
- try {
- translatedBytes = simpleString.getBytes(charsetName);
- newAsciiString = new String(translatedBytes, "ascii");
- newTrueString = new String(translatedBytes, charsetName);
- }
- 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;
- String newTrueString = null;
- byte[] translatedBytes = null;
- try {
- translatedBytes = simpleString.getBytes(charsetName);
- newAsciiString = new String(translatedBytes, "ascii");
- newTrueString = new String(translatedBytes, charsetName);
- }
- 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 "\"?>";
- }
-
-}
\ No newline at end of file
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 7d568db..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
+++ /dev/null
@@ -1,139 +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.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.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * 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 = Platform.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");
- }
- else {
- 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;
- }
-
-}
\ No newline at end of file
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 6fdc5ba..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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);
- }
-}
\ No newline at end of file
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 a91ff0c..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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);
- }
- }
-}
\ No newline at end of file
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 b1145c7..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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);
- }
- }
-}
\ No newline at end of file
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 412f6d7..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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);
- }
- }
-
-}
\ No newline at end of file
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 044bb2f..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 = "com.ibm.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();
- 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);
- }
- IContentDescription description = file.getContentDescription();
- 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", "ISO-8859-8", "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", "ISO-8859-8", "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("UTF-8", "UTF-8", "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-16BE", "UTF-16BE", "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-16BE", "UTF-16BE", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("UTF-16BE", "UTF-16BE", "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);
- }
-}
\ No newline at end of file
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 128d494..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java
+++ /dev/null
@@ -1,708 +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 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);
- }
-
- public void testFile129() throws CoreException, IOException {
- String charsetName = "X-UnicodeBig";
- doGenTest(charsetName);
- }
-
- public void testFile130() throws CoreException, IOException {
- String charsetName = "X-UnicodeLittle";
- doGenTest(charsetName);
- }
-}
\ No newline at end of file
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 51c600c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java
+++ /dev/null
@@ -1,528 +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 java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-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.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 = 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 = "com.ibm.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);
- Reader reader = null;
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
- IContentDescription contentDescription = file.getContentDescription();
- assertNotNull("Null content description", contentDescription);
-// EncodingMemento encodingMemento = (EncodingMemento) contentDescription.getProperty(IContentDescriptionExtended.ENCODING_MEMENTO);
-// assertNotNull("Null encodingMemento!", encodingMemento);
- String foundCharset = contentDescription.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);
- if (!asExpected) {
- InputStream contents = file.getContents(true);
- byte[] rawContents = new byte[1000];
- contents.read(rawContents);
- System.out.println(rawContents);
- }
- 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("UTF-8", "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-16BE", "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-16BE", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("UTF-16BE", "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);
- }
-
- 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 testFile128() throws CoreException, IOException {
- doTest("UTF-8", "testfiles/xml/UTF8With3ByteBOM.xml", null);
- }
-
-}
\ No newline at end of file
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 3feac6c..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java
+++ /dev/null
@@ -1,708 +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 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);
- }
-
- public void testFile129() throws CoreException, IOException {
- String charsetName = "X-UnicodeBig";
- doGenTest(charsetName);
- }
-
- public void testFile130() throws CoreException, IOException {
- String charsetName = "X-UnicodeLittle";
- doGenTest(charsetName);
- }
-
-
-
-}
\ No newline at end of file
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 0ad4bba..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java
+++ /dev/null
@@ -1,551 +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 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 String expectedCustomXMLContentType = "org.eclipse.wst.xml.core.xmlsource";
- private static final String expectedXMLContentType = "org.eclipse.core.runtime.xml";
- 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 = "com.ibm.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 {
- // 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);
- }
-
- public static void main(String[] args) {
- // try {
- // new TestCodedReader().doAllFiles();
- // } catch (CoreException e) {
- // e.printStackTrace();
- // } catch (IOException e) {
- // e.printStackTrace();
- // }
- }
-
- /**
- *
- */
- 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 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);
- assertEquals(expectedContentType, contentType.getId());
-
- }
- 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();
- // }
- // }
- // });
- }
- }
- }
-
-
- public void testFile100() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", 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 testFile101() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null);
- }
-
- public void testFile103() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "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);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTest(expectedXMLContentType, "testfiles/xml/MalformedNoEncoding.xml", null);
- }
-
- public void testFile107() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "testfiles/xml/MalformedNoEncoding.xsl", null);
- }
- 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);
- }
-
- 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);
- }
-
- 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(expectedCustomXMLContentType, "testfiles/xml/testNoXMLDecl.xml", null);
- }
- public void testFile120P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/testNoXMLDecl.xml", null);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "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(expectedCustomXMLContentType, "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 {
- doTest(expectedCustomXMLContentType, "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
- public void testFile124P() throws CoreException, IOException {
- doTestForParent(expectedXMLContentType, "testfiles/xml/UTF16LEAtStartOfLargeFile.xml", null);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTest(expectedCustomXMLContentType, "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 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 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 testFile6() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandard.css", 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.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null);
- }
-
- 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);
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null);
- }
-
- public void testFile7() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed.css", null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null);
- }
-
- public void testFile8() throws CoreException, IOException {
- doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed2.css", null);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", 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);
- }
-
- 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);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null);
- }
-
-
- public void testFile90() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null);
- }
-
-}
\ No newline at end of file
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 1df64c4..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 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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);
-
- }
-}
\ No newline at end of file
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 366261a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java
+++ /dev/null
@@ -1,172 +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.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 = 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-16BE", 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-16BE", new XMLResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.xml";
- doTestFileStream(filename, "UTF-8", 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());
- }
- }
-
-}
\ No newline at end of file
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 7065c9e..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.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.getTestReader(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) {
- if (tokenType == null)
- return false;
- else
- return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
-
- /**
- * 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, "UTF-8");
- }
-
- /**
- * 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");
- }
-}
\ No newline at end of file
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 30a19fb..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java
+++ /dev/null
@@ -1,260 +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.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;
-
-
-public class XMLMalformedInputTests 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 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
- */
- private 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 = 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;
- }
-
- public void testXMLMalformedInput() throws IOException {
- String filename = fileLocation + "MalformedNoEncoding.xml";
- doTestMalformedInput(filename, new XMLResourceEncodingDetector(), 51);
- }
-
- 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;
- 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)
- return charPosition;
- else
- return -1;
- }
-
- 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#!";
-
-}
\ No newline at end of file
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 3ebdea3..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/test.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- 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}\..\.." /> -->
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.xml.tests.encoding" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.xml.tests.encoding.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="wst-folder" value="${eclipse-home}/wst_folder"/>
- <delete dir="${wst-folder}" quiet="true" />
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${wst-folder}" />
- <property name="plugin-name" value="org.eclipse.wst.xml.tests.encoding" />
- <property name="classname" value="org.eclipse.wst.xml.tests.encoding.EncodingTestSuite" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.xml.tests.encoding.*xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- <!--<emailResults resultsFile="${wsad-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com,kitlo@us.ibm.com" /> -->
- </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 0698460..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/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 ea2ac0b..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,666 +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> from plugins\com.ibm.etools.xsdeditor\samples\PurchaseOrder </LI>
- <LI><B>Invoice.dtd</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>JobDesc.xml</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>Wireless.xml</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>gotchaTCBeans.set</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>ATS.dtd</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</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>\plugins\com.ibm.sed.editor\smoke\sampleFiles\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.
-The entry would look something like
-file:\C:\builds\wsa-jdk-20010625_0100-125-R09\eclipse\plugins\com.ibm.etools.webtools\DTDs\web-app_2_2.dtd
-</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> from plugins\com.ibm.etools.xmlbuilder\samples</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 c908974..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,667 +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> from plugins\com.ibm.etools.xsdeditor\samples\PurchaseOrder </LI>
- <LI><B>Invoice.dtd</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>JobDesc.xml</B> from plugins\com.ibm.etools.xmlbuilder\samples</LI>
- <LI><B>Wireless.xml</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>gotchaTCBeans.set</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</LI>
- <LI><B>ATS.dtd</B> from plugins\com.ibm.sed.editor\smoke\setupFiles</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>\plugins\com.ibm.sed.editor\smoke\sampleFiles\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.
-The entry would look something like
-file:\C:\builds\wsa-jdk-20010625_0100-125-R09\eclipse\plugins\com.ibm.etools.webtools\DTDs\web-app_2_2.dtd
-</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> from plugins\com.ibm.etools.xmlbuilder\samples</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/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/defect_4205_wps.jsp b/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 8e9cf4a..0000000
--- a/tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ page import="com.ibm.wps.*" %>
-<%@ 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.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/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/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/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.validation.tests/.classpath b/tests/org.eclipse.wst.xml.validation.tests/.classpath
deleted file mode 100644
index 275b34c..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <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 2c9b88d..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-validatexmltests.jar
diff --git a/tests/org.eclipse.wst.xml.validation.tests/.project b/tests/org.eclipse.wst.xml.validation.tests/.project
deleted file mode 100644
index dbf4416..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.validation.tests</name>
- <comment></comment>
- <projects>
- <project>com.ibm.etools.validation.xml</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties
deleted file mode 100644
index 705db94..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = plugin.xml,\
- test.xml,\
- testresources/,\
- validatexmltests.jar
-source.validatexmltests.jar = src/
-src.includes = test.xml,\
- plugin.xml,\
- .options
diff --git a/tests/org.eclipse.wst.xml.validation.tests/plugin.xml b/tests/org.eclipse.wst.xml.validation.tests/plugin.xml
deleted file mode 100644
index ac9f8d7..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.xml.validation.tests"
- name="XML Validator Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse"
- class="org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin">
-
- <runtime>
- <library name="validatexmltests.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.wst.xml.validation"/>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-
-
-</plugin>
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 3241439..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import junit.framework.Test;
-/**
- * The root test suite that contains all other XML validator test suites.
- *
- * @author Lawrence Mandel, IBM
- */
-public class AllXMLTests extends junit.framework.TestSuite
-{
- /**
- * Create this test suite.
- *
- * @return This test suite.
- */
- public static Test suite()
- {
- return new AllXMLTests();
- }
-
- /**
- * Constructor
- */
- public AllXMLTests()
- {
- super("XMLTestsTestSuite");
- addTest(XMLExamplesTest.suite());
- addTest(BugFixesTest.suite());
- addTest(PathsTest.suite());
- }
-}
\ 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 14faedc..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.validation.internal.core.ValidationMessage;
-import org.eclipse.wst.xml.validation.internal.core.ValidationReport;
-import org.eclipse.wst.xml.validation.internal.ui.eclipse.XMLValidator;
-
-
-/**
- * Base test case class which provides methods to
- * - create logs
- * - read from logs
- * - run log comparison tests
- *
- * @author Lawrence Mandel, IBM
- */
-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";
- private XMLValidator validator = XMLValidator.getInstance();
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp()
- {
- PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
- }
-
- /**
- * 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)
- {
- ValidationReport valreport = validator.validate(testfile);
- try
- {
- createLog(loglocation, valreport);
- String generatedLog = getStringFromFile(loglocation);
- String idealLog = getStringFromFile(idealloglocation);
- assertEquals(idealLog, generatedLog);
- } catch (Exception e)
- {
- fail("Could not compare log files");
- }
- }
-
- /**
- * Get a string representation of a file.
- *
- * @param filename the file name of the file to get the string representation.
- * @return The string representation if successful.
- * @throws Exception Thrown if unable to create a string representaion of the file.
- */
- private String getStringFromFile(String filename) throws Exception
- {
- 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++;
- warningsString.append(valmes.getMessage() + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- }
- else
- {
- numerrors++;
- errorsString.append(valmes.getMessage() + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- }
- }
- StringBuffer log = new StringBuffer();
- log.append("number of errors : " + numerrors + "\n");
- log.append("number of warnings : " + numwarnings + "\n\n");
- log.append("------------error list-------------------------------------------\n");
- if(numerrors == 0)
- {
- log.append("(none)\n");
- }
- else
- {
- log.append(errorsString.toString());
- }
- log.append("------------warning list-----------------------------------------\n");
- if(numwarnings == 0)
- {
- log.append("(none)\n");
- }
- else
- {
- log.append(warningsString.toString());
- }
- log.append("-----------------------------------------------------------------\n");
-
- DataOutputStream outStream = null;
- try
- {
- File logfile = new File(filename);
- File parent = logfile.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- if(logfile.exists())
- {
- logfile.delete();
- }
- logfile.createNewFile();
-
- outStream = new DataOutputStream(new FileOutputStream(filename, true));
- outStream.writeBytes(log.toString());
- outStream.close();
-
- } catch (IOException e)
- {
- // If we can't write the log then clear the log.
- log.delete(0, log.length());
- }
- return log.toString();
- }
-}
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 ec2db8d..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-/**
- * Test class for the XML validator to test bug fixes.
- *
- * @author Lawrence Mandel, IBM
- */
-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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "RootNoNSChildNS/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "RootNoNSChildNS/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "EmptyFile/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ValidateWithDTD/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-}
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 1d330c0..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Space InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracket)InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "CloseBracketInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Dash-InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "DashInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Exclamation!InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "ExclamationInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracket(InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "OpenBracketInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Period.InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "PeriodInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Quote'InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "QuoteInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "SpaceInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Tilde~InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "TildeInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "Underscore_InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "UnderscoreInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHat^InPath/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + PATHS_DIR + "AngleHatInFilename/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-}
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 4bdaf2a..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XMLExamples_DIR + "Invoice/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XMLExamples_DIR + "Invoice/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-
- /**
- * 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";
- String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + XMLExamples_DIR + "PublicationCatalogue/" + testname + ".xml-log";
- String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + XMLExamples_DIR + "PublicationCatalogue/" + testname + ".xml-log";
-
- runTest(testfile, loglocation, idealloglocation);
- }
-}
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 7d82f27..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.validation.tests.internal;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-/**
- * The plugin class for this test plugin.
- *
- * @author Lawrence Mandel, IBM
- */
-public class XMLValidatorTestsPlugin extends Plugin
-{
- private static XMLValidatorTestsPlugin plugin = null;
-
- public XMLValidatorTestsPlugin()
- {
- plugin = this;
- }
-
- public static String getPluginLocation()
- {
- try
- {
- return new Path(Platform.resolve(plugin.getBundle().getEntry("/")).getFile()).removeTrailingSeparator().toString();
- } catch (IOException e)
- {
- }
- return null;
- }
-}
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 49bdc77..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- Configurable Properties -->
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.xml.validation.tests"/>
-
- <!-- End Configurable Properties -->
-
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
- <property name="bvtworkspace" value="${basedir}"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="workspace-folder" value="${bvtworkspace}/${plugin-name}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org.eclipse.wst.xml.validation.tests.*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <!-- Start with clean data workspace -->
- <delete dir="${workspace-folder}" quiet="true"/>
-
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.xml.validation.tests.internal.AllXMLTests"/>
- </ant>
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <delete dir="${workspace-folder}" quiet="true"/>
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.wst.xml.validation.tests*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore b/tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore
deleted file mode 100644
index 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/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracket\051InPath/CloseBracketInPathValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket\051InFilenameValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Exclamation\041InPath/ExclamationInPathValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation\041InFilenameValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracket\050InPath/OpenBracketInPathValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket\050InFilenameValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Quote\047InPath/QuoteInPathValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml-log"
deleted file mode 100644
index b4853d1..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameInvalid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xml-log" "b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xml-log"
deleted file mode 100644
index aa2b361..0000000
--- "a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote\047InFilenameValid.xml-log"
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml-log
deleted file mode 100644
index b4853d1..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-XML document structures must start and end within the same entity. [2, 7]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/XMLExamples/Invoice/Invoice.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/XMLExamples/Invoice/Invoice.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/XMLExamples/Invoice/Invoice.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/XMLExamples/PublicationCatalogue/Catalogue.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/XMLExamples/PublicationCatalogue/Catalogue.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/XMLExamples/PublicationCatalogue/Catalogue.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/EmptyFile/Empty.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/EmptyFile/Empty.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/EmptyFile/Empty.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml-log
deleted file mode 100644
index 18ce823..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 1
-number of warnings : 0
-
-------------error list-------------------------------------------
-The content of element type "simple" must match "(simple1)". [6, 10]
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml-log b/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml-log
deleted file mode 100644
index aa2b361..0000000
--- a/tests/org.eclipse.wst.xml.validation.tests/testresources/idealResults/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml-log
+++ /dev/null
@@ -1,8 +0,0 @@
-number of errors : 0
-number of warnings : 0
-
-------------error list-------------------------------------------
-(none)
-------------warning list-----------------------------------------
-(none)
------------------------------------------------------------------
diff --git a/tests/org.eclipse.wst.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/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/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/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/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.validation.tests/.classpath b/tests/org.eclipse.wst.xsd.validation.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore b/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
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 c89028f..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/.project
+++ /dev/null
@@ -1,38 +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>
- <buildCommand>
- <name>com.ibm.etools.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.sse.model.structuredbuilder</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/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index bcb6018..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XSD Validation Tests Plug-in
-Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: validatexsdtests.jar
-Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin
-Bundle-Vendor: Eclipse
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources,
- org.junit,
- org.eclipse.wst.xsd.validation,
- org.eclipse.wst.xml.uriresolver,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.validation
-Eclipse-AutoStart: true
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 d35f3d4..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-bin.includes = plugin.xml,\
- *.jar,\
- validatexsdtests.jar,\
- test.xml,\
- testresources/,\
- META-INF/
-source.validatexsdtests.jar = src/
-src.includes = test.xml,\
- src/,\
- plugin.xml,\
- build.xml,\
- build.properties,\
- .options,\
- META-INF/,\
- testresources/
-
-bin.excludes = testresources/.cvsignore
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/plugin.xml b/tests/org.eclipse.wst.xsd.validation.tests/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-</plugin>
diff --git a/tests/org.eclipse.wst.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 4cf53cf..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-import junit.framework.Test;
-/**
- * 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(BugFixesTest.suite());
- addTest(PathsTest.suite());
- }
-}
\ 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 2ce1212..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.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.internal.resources.ProjectDescription;
-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.validation.internal.core.ValidationMessage;
-import org.eclipse.wst.xml.validation.internal.core.ValidationReport;
-import org.eclipse.wst.xsd.validation.internal.ui.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";
- 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)
- {
- ValidationReport valreport = validator.validate(testfile, null);
- 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("'[^']*org.eclipse.wst.xsd.validation.tests", "'org.eclipse.wst.xsd.validation.tests");
- message = message.replaceAll("[(][^(]*org.eclipse.wst.xsd.validation.tests", "(org.eclipse.wst.xsd.validation.tests");
- warningsString.append(message + " [" + valmes.getLineNumber() +", " + valmes.getColumnNumber() +"]\n");
- warningsString.append(createNestedMessageString(valmes.getNestedMessages()));
- }
- else
- {
- numerrors++;
- String message = valmes.getMessage();
- message = message.replaceAll("'[^']*org.eclipse.wst.xsd.validation.tests", "'org.eclipse.wst.xsd.validation.tests");
- message = message.replaceAll("[(][^(]*org.eclipse.wst.xsd.validation.tests", "(org.eclipse.wst.xsd.validation.tests");
- 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();
- }
-
- 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("'[^']*org.eclipse.wsdl.validate.tests", "'org.eclipse.wsdl.validate.tests");
- message = message.replaceAll("[(][^(]*org.eclipse.wsdl.validate.tests", "[(]org.eclipse.wsdl.validate.tests");
- 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 = new ProjectDescription();
- 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 026d614..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.validation.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.xml.uriresolver.XMLCatalog;
-import org.eclipse.wst.xml.uriresolver.XMLCatalogEntry;
-import org.eclipse.wst.xml.uriresolver.XMLCatalogPlugin;
-
-/**
- * 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 = FILE_PROTOCOL + 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";
-
- IProject project = createSimpleProject("Project", new String[]{testfile});
- IFile file = project.getFile(testname + ".xsd");
-
- XMLCatalog catalog = XMLCatalogPlugin.getInstance().getDefaultXMLCatalog();
- catalog = catalog.getChildCatalog(XMLCatalog.USER_CATALOG_ID);
- XMLCatalogEntry entry = catalog.createEntry();
- entry.setKey("http://www.example.com/invalid");
- entry.setURI("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd");
- entry.setType(XMLCatalogEntry.PUBLIC);
- catalog.addEntry(entry);
-
- runTest("platform:/resource/Project/InvalidSchemaInXMLCatalog.xsd"/*FILE_PROTOCOL + file.getLocation().toString()*/, loglocation, idealloglocation);
-
- catalog.removeEntry(entry);
- }
-
- /**
- * 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);
- }
-}
\ 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 62b12a5..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, 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.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);
- }
-
-}
\ No newline at end of file
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 e19baf4..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, 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.xsd.validation.tests.internal;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The 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 Platform.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 9066b8f..0000000
--- a/tests/org.eclipse.wst.xsd.validation.tests/test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- Configurable Properties -->
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.wst.xsd.validation.tests"/>
-
- <!-- End Configurable Properties -->
-
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
- <property name="bvtworkspace" value="${basedir}"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/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.xsd.validation.tests.*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <!-- Start with clean data workspace -->
- <delete dir="${workspace-folder}" quiet="true"/>
-
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.wst.xsd.validation.tests.AllXSDTests"/>
- </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.xsd.validation.tests*.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/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/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/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 d091f3f..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd). For more information, right click on the message 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 119a7bf..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd). For more information, right click on the message 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 370ac67..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd). For more information, right click on the message 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 a34b028..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd). For more information, right click on the message 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 fa6b779..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd). For more information, right click on the message 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 32ac55a..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd). For more information, right click on the message 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 5f327f8..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd). For more information, right click on the message 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 d4b170f..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd). For more information, right click on the message 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 0bcafe7..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd). For more information, right click on the message 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 21e7333..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd). For more information, right click on the message 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 4f3ddb2..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd). For more information, right click on the message 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 6262c3f..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd). For more information, right click on the message 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 3d813d3..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xsd). For more information, right click on the message 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 80ec20f..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd). For more information, right click on the message 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 893cf51..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd). For more information, right click on the message 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 4d8da81..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd). For more information, right click on the message 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/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 ea24ee5..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde%7EInFilenameInvalid.xsd). For more information, right click on the message 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 a680b37..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd). For more information, right click on the message 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 8ddcf39..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd). For more information, right click on the message 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 9745138..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 (org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd). For more information, right click on the message 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/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/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/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>
